1. 05 Dec, 2005 2 commits
    • unknown's avatar
      Fix for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs · 502412f9
      unknown authored
      Solution according to the comments made by Guilhem
      - rpl_relayrotate  Remove the SHOW SLAVE STATUS  It is not needed.
      - rpl_until, rpl_deadlock Omit the printing of the "Slave_IO_Running" value
      
      
      mysql-test/r/rpl_deadlock.result:
        Updated result
      mysql-test/r/rpl_relayrotate.result:
        Updated result
      mysql-test/r/rpl_until.result:
        Updated result
      mysql-test/t/disabled.def:
        Enabling of the testcases rpl_relayrotate, rpl_until, rpl_deadlock
      mysql-test/t/rpl_deadlock.test:
        Omit the printing of the "Slave_IO_Running" value
      mysql-test/t/rpl_relayrotate.test:
        Remove the SHWO STATUS SLAVE command
      mysql-test/t/rpl_until.test:
        Omit the printing of the "Slave_IO_Running" value
      502412f9
    • unknown's avatar
      Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE · d447f881
      unknown authored
        is not defined.
      
      
      client/mysql.cc:
        Fix missing \n in the --help header when HAVE_READLINE is not defined.
      d447f881
  2. 04 Dec, 2005 4 commits
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · e236de83
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      netware/mysql_test_run.c:
        Merged from 4.1.
      e236de83
    • unknown's avatar
      Fixes multi_statement test case on NetWare. · 928ee5ce
      unknown authored
      928ee5ce
    • unknown's avatar
      Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 69e0cc6d
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      
      
      client/mysql.cc:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqlimport.c:
        Auto merged
      client/mysqlshow.c:
        Auto merged
      isam/isamchk.c:
        Auto merged
      myisam/myisamchk.c:
        Auto merged
      myisam/myisampack.c:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Merged from 4.0.
      69e0cc6d
    • unknown's avatar
      A set of Netware related patches. · 60f2e7a9
      unknown authored
      
      client/mysql.cc:
        Fixed option name.
      client/mysqladmin.c:
        Fixed option name.
      client/mysqlbinlog.cc:
        Fixed option name.
      client/mysqlcheck.c:
        Fixed option name.
      client/mysqldump.c:
        Fixed option name.
      client/mysqlimport.c:
        Fixed option name.
      client/mysqlshow.c:
        Fixed option name.
      isam/isamchk.c:
        Fixed option name.
      myisam/myisamchk.c:
        Fixed option name.
      myisam/myisampack.c:
        Fixed option name.
      sql/sql_parse.cc:
        Fix problem with kill connection on NetWare.
      60f2e7a9
  3. 03 Dec, 2005 2 commits
    • unknown's avatar
      my_global.h: · bbaf62b4
      unknown authored
        Make __cxa_pure_virtual weak symbol
      
      
      include/my_global.h:
        Make __cxa_pure_virtual weak symbol
      bbaf62b4
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 30beae25
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      30beae25
  4. 02 Dec, 2005 18 commits
  5. 01 Dec, 2005 14 commits
    • unknown's avatar
      Post-merge result file cleanup · 025d8c14
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Fix results
      025d8c14
    • unknown's avatar
      Fix bug#15028 Multitable update returns different numbers of matched rows · 136c8173
      unknown authored
      depending on table order
      
      multi_update::send_data() was counting updates, not updated rows. Thus if one 
      record have several updates it will be counted several times in 'rows matched'
      but updated only once.
      
      multi_update::send_data() now counts only unique rows.
      
      
      sql/sql_update.cc:
        Fix bug#15028  Multitable update returns different numbers of matched rows
        depending on table order
        multi_update::send_data() now counts only unique rows.
      mysql-test/t/update.test:
        Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      mysql-test/r/update.result:
        Test case for bug#15028 Multitable update returns different numbers of matched rows depending on table order
      136c8173
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-13318 · 3016ec15
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysqldump.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Resolve conflicts
      mysql-test/t/mysqldump.test:
        Resolve conflicts
      3016ec15
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12612 · f604204f
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/func_equal.result:
        Auto merged
      mysql-test/t/func_equal.test:
        Auto merged
      sql/item_cmpfunc.cc:
        SCCS merged
      f604204f
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-keysize · 5df3be70
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      5df3be70
    • unknown's avatar
      Enable key lengths of up to 3K on 32-bit platforms. · 4b4f7f76
      unknown authored
      
      mysql-test/r/bdb.result:
        Add new results
      mysql-test/r/innodb.result:
        Add new results
      mysql-test/t/bdb.test:
        Add simple test that large keys are allowed
      mysql-test/t/innodb.test:
        Add simple test that large keys are allowed
      sql/unireg.h:
        Allow key length of 3K even on 32-bit platforms
      4b4f7f76
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9dcae047
      unknown authored
      into  selena.:H:/MYSQL/src/#14902-mysql-5.0
      
      
      mysql-test/r/analyze.result:
        SCCS merged
      mysql-test/t/analyze.test:
        SCCS merged
      9dcae047
    • unknown's avatar
      postmerge fix · b97a5c53
      unknown authored
      b97a5c53
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 01b65b73
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
      
      
      01b65b73
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · f0b33dd9
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
      
      
      configure.in:
        merge
      mysql-test/r/query_cache.result:
        merge
      mysql-test/t/query_cache.test:
        merge
      sql/sql_cache.cc:
        merge
      f0b33dd9
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 483e04b2
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
      
      
      483e04b2
    • unknown's avatar
      We should skip beggining '(' characters when test query on possibility · a050707b
      unknown authored
      to be in the query cache. (BUG#14652)
      
      
      mysql-test/r/query_cache.result:
        BUG#14652 test suite.
      mysql-test/t/query_cache.test:
        BUG#14652 test suite.
      sql/sql_cache.cc:
        We should skip beggining '(' characters when test query on possibility
        to be in the query cache.
      a050707b
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · babaa74e
      unknown authored
      into  mysql.com:/usr/home/ram/work/mysql-5.0
      
      
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      babaa74e
    • unknown's avatar
      Fix for bug #14304: auto_increment field incorrect set from within stored... · f853fbc9
      unknown authored
      Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
      
      
      sql/sp_head.cc:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - call thd->cleanup_after_query() to clean next_insert_id.
      sql/sql_class.cc:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - save/restore clear_next_insert_id
      sql/sql_class.h:
        Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
        - clear_next_insert_id added
      f853fbc9