1. 30 Aug, 2005 2 commits
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · dcbbffa5
      unknown authored
      into  mysql.com:/usr/home/ram/work/4.1.b9613
      
      
      sql/set_var.cc:
        Auto merged
      dcbbffa5
    • unknown's avatar
      ha_blackhole.cc: · 40cfe1e9
      unknown authored
        Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
      
      
      sql/ha_blackhole.cc:
        Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
      40cfe1e9
  2. 29 Aug, 2005 6 commits
  3. 28 Aug, 2005 5 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 8dd3a7d9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      8dd3a7d9
    • unknown's avatar
      Makefile.am: · f658a7a7
      unknown authored
        Make ports configurable from environment for test
      
      
      Makefile.am:
        Make ports configurable from environment for test
      f658a7a7
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · ee4db475
      unknown authored
      into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      ee4db475
    • unknown's avatar
      set_var.cc: · d7ff622e
      unknown authored
        Reorder out-of-order system variables.
      
      
      sql/set_var.cc:
        Reorder out-of-order system variables.
      d7ff622e
    • unknown's avatar
      mysqld.cc: · 52e3c0a2
      unknown authored
        Reorder out-of-order status variables.
      
      
      sql/mysqld.cc:
        Reorder out-of-order status variables.
      52e3c0a2
  4. 27 Aug, 2005 1 commit
  5. 26 Aug, 2005 4 commits
  6. 25 Aug, 2005 10 commits
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8ec12a86
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      8ec12a86
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · fc5aff71
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      
      fc5aff71
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-4.1 · 7fafb009
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      
      7fafb009
    • unknown's avatar
      bug#12027 - ndb · 58e57625
      unknown authored
        When detecting corrupt schema file.
        Make sure to close it (as it will be opened later when rewriting a clean copy)
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        bug#12027 
          When detecting corrupt schema file.
          Make sure to close it (as it will be opened later when rewriting a clean copy)
      58e57625
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4b59ede9
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      4b59ede9
    • unknown's avatar
      config: · 685c9a05
      unknown authored
        changed tomas default checkout
      
      
      BitKeeper/etc/config:
        changed tomas default checkout
      685c9a05
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · ea09b970
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      client/mysqlcheck.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/my_print_defaults.c:
        Auto merged
      extra/perror.c:
        Auto merged
      extra/resolve_stack_dump.c:
        Auto merged
      include/help_end.h:
        Auto merged
      include/help_start.h:
        Auto merged
      isam/isamchk.c:
        Auto merged
      isam/pack_isam.c:
        Auto merged
      myisam/myisamlog.c:
        Auto merged
      netware/myisamchk.def:
        Auto merged
      netware/mysql.def:
        Auto merged
      netware/mysqladmin.def:
        Auto merged
      netware/mysqlbinlog.def:
        Auto merged
      netware/mysqlcheck.def:
        Auto merged
      netware/mysqldump.def:
        Auto merged
      netware/mysqlimport.def:
        Auto merged
      netware/mysqlshow.def:
        Auto merged
      client/client_priv.h:
        Merged from 4.0.
      client/mysql.cc:
        Merged from 4.0.
      client/mysqladmin.cc:
        Merged from 4.0.
      client/mysqlbinlog.cc:
        Merged from 4.0.
      client/mysqldump.c:
        Merged from 4.0.
      client/mysqlshow.c:
        Merged from 4.0.
      myisam/myisamchk.c:
        Merged from 4.0.
      myisam/myisampack.c:
        Merged from 4.0.
      netware/mysql_test_run.c:
        Merged from 4.0.
      netware/mysqld_safe.c:
        Merged from 4.0.
      sql/mysqld.cc:
        Merged from 4.0.
      ea09b970
    • unknown's avatar
      Add back changes lost in merge · a3277cff
      unknown authored
      (Faster test)
      
      
      mysql-test/t/rpl_drop_db.test:
        Add back changes lost in merge
      a3277cff
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b91b8235
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      
      b91b8235
    • unknown's avatar
      Remove function that was accidently added back · 0f752763
      unknown authored
      0f752763
  7. 24 Aug, 2005 12 commits
    • unknown's avatar
      merged · 9e796abb
      unknown authored
      9e796abb
    • unknown's avatar
      memroot: trash the memory in free_root() · 961abf79
      unknown authored
      961abf79
    • unknown's avatar
      Several fixes for Netware. · 97dbe8db
      unknown authored
      
      client/client_priv.h:
        Added option auto close for Netware.
      client/mysql.cc:
        Added option auto close for Netware.
      client/mysqladmin.c:
        Added option auto close for Netware.
      client/mysqlbinlog.cc:
        Added option auto close for Netware.
      client/mysqlcheck.c:
        Added option auto close for Netware.
      client/mysqldump.c:
        Added option auto close for Netware.
      client/mysqlimport.c:
        Added option auto close for Netware.
      client/mysqlshow.c:
        Added option auto close for Netware.
      client/mysqltest.c:
        Fixed help messages for Netware.
      extra/my_print_defaults.c:
        Fixed help messages for Netware.
      extra/perror.c:
        Fixed help messages for Netware.
      extra/resolve_stack_dump.c:
        Fixed help messages for Netware.
      include/help_end.h:
        Fixed help messages for Netware.
      include/help_start.h:
        Fixed help messages for Netware.
      isam/isamchk.c:
        Added auto close of window for Netware
      isam/pack_isam.c:
        Added auto close of window for Netware
      myisam/myisamchk.c:
        Added auto close of window for Netware
      myisam/myisamlog.c:
        Added help for Netware.
      myisam/myisampack.c:
        Added auto close for Netware.
      netware/myisamchk.def:
        Scrollable screen patch.
      netware/mysql.def:
        Scrollable screen patch.
      netware/mysql_test_run.c:
        Fixed strindex for Netware.
      netware/mysqladmin.def:
        Scrollable screen patch.
      netware/mysqlbinlog.def:
        Scrollable screen patch.
      netware/mysqlcheck.def:
        Scrollable screen patch.
      netware/mysqld_safe.c:
        Removed debug message for Netware.
      netware/mysqldump.def:
        Scrollable screen patch.
      netware/mysqlimport.def:
        Scrollable screen patch.
      netware/mysqlshow.def:
        Scrollable screen patch.
      sql/mysqld.cc:
        Abnormal end patch when shutting down and volume not ready.
      97dbe8db
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e0f9b8a8
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      
      e0f9b8a8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9171169e
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      
      9171169e
    • unknown's avatar
      Review fixes · 7b39b01b
      unknown authored
      
      mysql-test/r/ctype_cp932.result:
        Remove first event to make things portable
      mysql-test/r/rpl_drop_db.result:
        Use 'mysqltest' as database instead of 'd1'
        Made test faster by using longer table names instead of lots of tables
      mysql-test/t/ctype_cp932.test:
        Remove first event to make things portable
      mysql-test/t/rpl_drop_db.test:
        Use 'mysqltest' as database instead of 'd1'
        Made test faster by using longer table names instead of lots of tables
      sql/sql_db.cc:
        Indentation & style fixes
        Simple optimization (remove constant and boolean variable)
      7b39b01b
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12302 · 2be4560e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      2be4560e
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 23aecc5c
      unknown authored
      into  hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      23aecc5c
    • unknown's avatar
      subselect2.result: · 7e03ff1e
      unknown authored
        Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
      
      
      mysql-test/r/subselect2.result:
        Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
      7e03ff1e
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6f24ba5f
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      6f24ba5f
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.0 · 891740bf
      unknown authored
      into  hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      891740bf
    • unknown's avatar
      ha_innodb.cc: · 4c76d94f
      unknown authored
        Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
      
      
      sql/ha_innodb.cc:
        Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
      4c76d94f