1. 29 Aug, 2005 2 commits
    • 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
  2. 27 Aug, 2005 1 commit
  3. 26 Aug, 2005 3 commits
  4. 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
  5. 24 Aug, 2005 14 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
    • unknown's avatar
      subselect2.result: · fbdd529f
      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
      fbdd529f
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 382f788a
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      382f788a
    • unknown's avatar
      Merge hundin.mysql.fi:/home/heikki/mysql-4.0 · 3524d734
      unknown authored
      into  hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      3524d734
    • unknown's avatar
      ha_innodb.cc: · c50bd2d3
      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
      c50bd2d3
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6f0b8fa8
      unknown authored
      into mysql.com:/M41/mysql-4.1
      
      
      mysys/charset.c:
        Auto merged
      6f0b8fa8
    • unknown's avatar
      Merge · 64b9cf06
      unknown authored
      
      mysys/charset.c:
        SCCS merged
      64b9cf06
  6. 23 Aug, 2005 4 commits
    • unknown's avatar
      Merge · 9795796e
      unknown authored
      9795796e
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 7a17e979
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
      
      
      configure.in:
        Auto merged
      7a17e979
    • unknown's avatar
      removed ndb grep from configure .in · 1a4532e3
      unknown authored
      
      BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
        Delete: ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile
      BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
        Delete: ndb/src/kernel/blocks/grep/Grep.cpp
      BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
        Delete: ndb/src/kernel/blocks/grep/Makefile.am
      BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
        Delete: ndb/src/kernel/blocks/grep/Grep.hpp
      BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
        Delete: ndb/src/kernel/blocks/grep/GrepInit.cpp
      BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
        Delete: ndb/src/kernel/blocks/grep/systab_test/Makefile
      BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
        Delete: ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp
      BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
        Delete: ndb/test/ndbapi/testGrep.cpp
      1a4532e3
    • unknown's avatar
      enabled make of ndb_redo_log_reader · 626c24af
      unknown authored
      626c24af
  7. 22 Aug, 2005 6 commits