1. 02 Jul, 2003 11 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · cb151c2a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      cb151c2a
    • unknown's avatar
      add comment for BUG 672 · 34b4da78
      unknown authored
      34b4da78
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 4872adb6
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      4872adb6
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 · 8c113acf
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0
      
      
      client/mysqlbinlog.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      8c113acf
    • unknown's avatar
      fixed bug #672 · 71373afb
      unknown authored
      
      client/mysqlbinlog.cc:
        changed format of eof-packet for protocol 4.1
      71373afb
    • unknown's avatar
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 · fd693194
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.0
      
      
      fd693194
    • unknown's avatar
      Fix for a problem with : · 66237f45
      unknown authored
      CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;
      
      
      66237f45
    • unknown's avatar
      innodb.test, innodb.result: · 7ad2b849
      unknown authored
        Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)
      
      
      mysql-test/r/innodb.result:
        Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)
      mysql-test/t/innodb.test:
        Remove nondeterministic EXPLAIN SELECT which gives on 64-bit platforms a slightly different estimate (sometimes we should study why we get different results on 64-bit and 32-bit)
      7ad2b849
    • unknown's avatar
      sync0sync.c: · c7c8a913
      unknown authored
        Make execution with UNIV_SYNC_DEBUG faster
      
      
      innobase/sync/sync0sync.c:
        Make execution with UNIV_SYNC_DEBUG faster
      c7c8a913
    • unknown's avatar
      lock0lock.c: · 62389a5a
      unknown authored
        Fix a latching order violation in the previous (2003-06-15) push: could lead to a hang on the btr0sea.c semaphore
      
      
      innobase/lock/lock0lock.c:
        Fix a latching order violation in the previous (2003-06-15) push: could lead to a hang on the btr0sea.c semaphore
      62389a5a
  2. 01 Jul, 2003 19 commits
    • unknown's avatar
      ha_innodb.cc: · 24d93bed
      unknown authored
        Cleanup
      
      
      sql/ha_innodb.cc:
        Cleanup
      24d93bed
    • unknown's avatar
      ha_innodb.cc: · 593c6d9a
      unknown authored
        Remove still some potential hangs over the btr0sea.c semaphore
      
      
      sql/ha_innodb.cc:
        Remove still some potential hangs over the btr0sea.c semaphore
      593c6d9a
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 · a2dfa952
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.0
      
      
      a2dfa952
    • unknown's avatar
      Some fixes for CREATE / INSERT FROM UNIO >.. · 417c571b
      unknown authored
      417c571b
    • unknown's avatar
      merge changes · 65d79805
      unknown authored
      
      mysql-test/r/insert_select.result:
        Auto merged
      mysql-test/t/insert_select.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      65d79805
    • unknown's avatar
      Lot's of clean-ups and fixes for 4.0.14. · 12d879c9
      unknown authored
      
      include/my_global.h:
        CONFIG_SMP
      mysql-test/r/grant.result:
        Test cases for bug fixes
      mysql-test/r/insert_select.result:
        Test cases for bug fixes
      mysql-test/r/union.result:
        Test cases for bug fixes
      mysql-test/t/grant.test:
        Test cases for bug fixes
      mysql-test/t/insert_select.test:
        Test cases for bug fixes
      mysql-test/t/union.test:
        Test cases for bug fixes
      sql/sql_acl.cc:
        Fix for granting global privileges on db level
      sql/sql_parse.cc:
        Fix for INSERT... SELECT
      sql/sql_select.cc:
        removing a fix
      sql/sql_union.cc:
        P
      12d879c9
    • unknown's avatar
      Merge heikki@build.mysql.com:/home/bk/mysql-4.0 · 6806765a
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.0
      
      
      6806765a
    • unknown's avatar
      ha_innodb.cc: · 25230490
      unknown authored
        Fix a possible hang over the btr0sea.c latch
      
      
      sql/ha_innodb.cc:
        Fix a possible hang over the btr0sea.c latch
      25230490
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · 49938821
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      49938821
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · cc6fc0ea
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      cc6fc0ea
    • unknown's avatar
      made error output more detailed · f3381e73
      unknown authored
      f3381e73
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 · f604b050
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_671/mysql-4.0
      
      
      client/mysqlbinlog.cc:
        Auto merged
      f604b050
    • unknown's avatar
      removed --table option (fixed Bug #671) · f1ef7dd0
      unknown authored
      
      client/mysqlbinlog.cc:
        removed --table option
      f1ef7dd0
    • unknown's avatar
      Updated results after merge · 46bcc475
      unknown authored
      46bcc475
    • unknown's avatar
      Merge with 3.23 tree to get latest bug fixes · 5a3c12ef
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/item_func.cc:
        Auto merged
      mysql-test/t/user_var.test:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/nt_servc.cc:
        Auto merged
      configure.in:
        Use local version
      innobase/os/os0file.c:
        Use local version
      innobase/page/page0page.c:
        Use local version
      innobase/row/row0sel.c:
        Use local version
      innobase/row/row0vers.c:
        Use local version
      mysql-test/r/order_by.result:
        Use local version
      mysql-test/r/user_var.result:
        merge with 3.23
      mysql-test/t/order_by.test:
        Use local version (test is already in range.test)
      sql/log.cc:
        Use local version
      sql/share/spanish/errmsg.txt:
        merge
      sql/slave.cc:
        Use local version
      sql/sql_class.h:
        Use local version
      sql/sql_select.cc:
        Use patch in 4.0 for range with NULL problem
      5a3c12ef
    • unknown's avatar
      Optimized old patches · 23a9a580
      unknown authored
      Don't set field to DEFAULT value when set to NULL
      
      
      mysql-test/r/insert.result:
        Updated results after patch
      sql/field_conv.cc:
        Revert patch: Don't set field to DEFAULT value when set to NULL
      sql/item_strfunc.cc:
        Optimized patch for null handling with elt
      sql/opt_range.cc:
        Safety fix for range with null patch
      23a9a580
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 0fe578f5
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-4.0
      
      
      sql/item_strfunc.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      0fe578f5
    • unknown's avatar
      Code/testcase cleanups · bbf8ebe8
      unknown authored
      
      mysql-test/r/insert_select.result:
        Fixed results
      mysql-test/r/join_outer.result:
        New test case for inner join table dependency
      mysql-test/t/insert_select.test:
        Remove not used drop tables.
        Fixed table names
      mysql-test/t/join_outer.test:
        New test case for inner join table dependency
      sql/slave.cc:
        Simple optimizations
      bbf8ebe8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-3.23 · 1726ae86
      unknown authored
      into mashka.mysql.fi:/home/my/mysql-3.23
      
      
      1726ae86
  3. 30 Jun, 2003 5 commits
  4. 29 Jun, 2003 2 commits
  5. 27 Jun, 2003 2 commits
    • unknown's avatar
      Fixed testcase after last changes · 5768f4a3
      unknown authored
      5768f4a3
    • unknown's avatar
      Added thread variable max_seeks_for_key · c2cb9b97
      unknown authored
      Change optimizer to prefer key lookups before table scan
      Change table scans to be done after tables with constrains on scanned table 
      
      
      mysql-test/r/distinct.result:
        Update results
      mysql-test/r/group_by.result:
        Update results
      mysql-test/r/heap.result:
        Update results
      mysql-test/r/join.result:
        Update results
      mysql-test/r/key_diff.result:
        Update results
      mysql-test/r/myisam.result:
        Update results
      mysql-test/r/order_by.result:
        Update results
      mysql-test/r/select_safe.result:
        Update results
      mysql-test/t/distinct.test:
        Change test to be repeatable
      mysql-test/t/join.test:
        Change test to be repeatable
      mysql-test/t/select_safe.test:
        Add tests for MAX_SEEKS_FOR_KEY
      sql/handler.h:
        Optimize structure for 64 bit machines (and to avoid problems with gdb)
      sql/item_cmpfunc.cc:
        Initialize not_null_tables_cache properly
      sql/mysqld.cc:
        Added max_seeks_for_key
      sql/set_var.cc:
        Added max_seeks_for_key
      sql/sql_class.h:
        Added max_seeks_for_key
      sql/sql_select.cc:
        Added max_seeks_for_key
        Change optimizer to prefer key lookups before table scan.
        Change table scans to be done after tables with constrains on scanned table
      c2cb9b97
  6. 26 Jun, 2003 1 commit