1. 30 Aug, 2005 2 commits
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · c9c119bd
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      c9c119bd
    • unknown's avatar
      ha_blackhole.cc: · 6ab11f1e
      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!
      6ab11f1e
  2. 29 Aug, 2005 11 commits
    • unknown's avatar
      ha_blackhole.cc: · ccd3eeeb
      unknown authored
        Added missing DBUG enter, compiled and tested on production with debug-max
        build (my regular build missed the previous errors friday)
      
      Changeset:
       Added missing DBUG_ENTER, compiled and tested on production with debug-max
       build!
      
      
      
      sql/ha_blackhole.cc:
        Added missing DBUG enter, compiled and tested on production with debug-max build (my regular build missed the previous errors friday)
        C
      ccd3eeeb
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 86b9d2eb
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      86b9d2eb
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · d09c4f6e
      unknown authored
      into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
      
      d09c4f6e
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c61fa49c
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      c61fa49c
    • unknown's avatar
    • unknown's avatar
      Bug#12296 - CHECKSUM TABLE reports 0 for the table · c32397ce
      unknown authored
      Skipping deleted records instead of breaking the loop
      during checksum calculation.
      
      
      mysql-test/r/myisam.result:
        Bug#12296 - CHECKSUM TABLE reports 0 for the table
        The test result.
      mysql-test/t/myisam.test:
        Bug#12296 - CHECKSUM TABLE reports 0 for the table
        The test case.
      c32397ce
    • unknown's avatar
      Bug#11816 - Truncate table doesn't work with temporary innodb tables · 5c0372f0
      unknown authored
      Handle temporary tables like permanent tables: If the storage engine
      cannot truncate, delete instead.
      
      
      mysql-test/r/innodb.result:
        Bug#11816 - Truncate table doesn't work with temporary innodb tables
        The test result.
      mysql-test/t/innodb.test:
        Bug#11816 - Truncate table doesn't work with temporary innodb tables
        The test case.
      sql/sql_delete.cc:
        Bug#11816 - Truncate table doesn't work with temporary innodb tables
        Handle temporary tables like permanent tables: If the storage engine
        cannot truncate, delete instead.
        Replaced a numeric literal by its symbolic name.
      5c0372f0
    • unknown's avatar
      Bug#11493 - Alter table rename to default database does not work without db name qualifying · 0f89b693
      unknown authored
      Supplied the default database name for ALTER TABLE ... RENAME 
      for the new table instead of the old tables db like we do for 
      other ALTERs.
      
      
      mysql-test/r/alter_table.result:
        Bug#11493 - Alter table rename to default database does not work without db name qualifying
        The test result.
      mysql-test/t/alter_table.test:
        Bug#11493 - Alter table rename to default database does not work without db name qualifying
        The test case.
      0f89b693
    • unknown's avatar
      Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table · 641a7a14
      unknown authored
      Changed end-space comparison so that the key is not used past
      its end. This is due to the new end-space behaviour in 4.1.
      See also bug 6151 and 9188.
      
      
      mysql-test/r/key.result:
        Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
        The test result.
      mysql-test/t/key.test:
        Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
        The test case.
      641a7a14
    • unknown's avatar
      ctype_utf8.result, ctype_utf8.test, item.cc: · f68520c9
      unknown authored
        Bug#12371 executing prepared statement fails (illegal mix of collations)
        After review fixes.
      
      
      sql/item.cc:
        Bug#12371 executing prepared statement fails (illegal mix of collations)
        After review fixes.
      mysql-test/t/ctype_utf8.test:
        Bug#12371 executing prepared statement fails (illegal mix of collations)
        After review fixes.
      mysql-test/r/ctype_utf8.result:
        Bug#12371 executing prepared statement fails (illegal mix of collations)
        After review fixes.
      f68520c9
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · ead894c1
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b12371
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      ead894c1
  3. 28 Aug, 2005 5 commits
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · 8bfaf9e5
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      8bfaf9e5
    • unknown's avatar
      Makefile.am: · d70125db
      unknown authored
        Make ports configurable from environment for test
      
      
      Makefile.am:
        Make ports configurable from environment for test
      d70125db
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4fca19b3
      unknown authored
      into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
      
      
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      4fca19b3
    • unknown's avatar
      set_var.cc: · dee3b44a
      unknown authored
        Reorder out-of-order system variables.
      
      
      sql/set_var.cc:
        Reorder out-of-order system variables.
      dee3b44a
    • unknown's avatar
      mysqld.cc: · 0ef85172
      unknown authored
        Reorder out-of-order status variables.
      
      
      sql/mysqld.cc:
        Reorder out-of-order status variables.
      0ef85172
  4. 27 Aug, 2005 1 commit
  5. 26 Aug, 2005 3 commits
  6. 25 Aug, 2005 10 commits
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · e3db79ed
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      e3db79ed
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0cedaee0
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      0cedaee0
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-4.1 · 92b93be0
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      92b93be0
    • unknown's avatar
      bug#12027 - ndb · 7ea7e108
      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)
      7ea7e108
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c1ba74fa
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      c1ba74fa
    • unknown's avatar
      config: · 8d62665c
      unknown authored
        changed tomas default checkout
      
      
      BitKeeper/etc/config:
        changed tomas default checkout
      8d62665c
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · cfc1f7af
      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.
      cfc1f7af
    • unknown's avatar
      Add back changes lost in merge · 0b80fbce
      unknown authored
      (Faster test)
      
      
      mysql-test/t/rpl_drop_db.test:
        Add back changes lost in merge
      0b80fbce
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 20b4f05f
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      20b4f05f
    • unknown's avatar
      Remove function that was accidently added back · ee93bd68
      unknown authored
      ee93bd68
  7. 24 Aug, 2005 8 commits
    • unknown's avatar
      merged · e69c5734
      unknown authored
      e69c5734
    • unknown's avatar
      memroot: trash the memory in free_root() · a0691bd8
      unknown authored
      a0691bd8
    • unknown's avatar
      Several fixes for Netware. · 2451d94f
      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.
      2451d94f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9ced1d5c
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      9ced1d5c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 30e6e0e6
      unknown authored
      into  mishka.local:/home/my/mysql-4.1
      
      30e6e0e6
    • unknown's avatar
      Review fixes · e497d7fc
      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)
      e497d7fc
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12302 · a1f24ff3
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      a1f24ff3
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 17cd250d
      unknown authored
      into  hundin.mysql.fi:/home/heikki/mysql-4.1
      
      17cd250d