1. 05 Dec, 2005 5 commits
  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 11 commits