1. 09 Sep, 2005 8 commits
    • unknown's avatar
      Post-merge fixes · fa3c6c76
      unknown authored
      fa3c6c76
    • unknown's avatar
      Post-merge fixes · 0ef988ad
      unknown authored
      
      client/mysqlimport.c:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/r/olap.result:
        Auto merged
      mysql-test/t/connect.test:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/main.cpp:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.hpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/ndbapi/Makefile.am:
        Auto merged
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      ndb/test/src/NdbBackup.cpp:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      0ef988ad
    • unknown's avatar
      f32088a9
    • unknown's avatar
      Merge 4.1->5.0 · 20994fec
      unknown authored
      
      client/mysqlimport.c:
        Auto merged
      configure.in:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/connect.test:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Auto merged
      ndb/src/kernel/blocks/backup/Backup.hpp:
        Auto merged
      ndb/src/kernel/main.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      ndb/src/ndbapi/Makefile.am:
        Auto merged
      ndb/test/src/NdbBackup.cpp:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      20994fec
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ed7e973
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug12943
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      5ed7e973
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 65ba93fd
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/t/connect.test:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      65ba93fd
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1266ccc8
      unknown authored
      into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
      
      
      ndb/src/ndbapi/SignalSender.cpp:
        Merge
      1266ccc8
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · a49e23ad
      unknown authored
      into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
      
      
      mysql-test/r/connect.result:
        Auto merged
      mysql-test/t/connect.test:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      sql/sql_class.cc:
        SCCS merged
      a49e23ad
  2. 08 Sep, 2005 32 commits