1. 03 Jan, 2005 9 commits
  2. 02 Jan, 2005 2 commits
  3. 01 Jan, 2005 9 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4cff6feb
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Auto merged
      ndb/include/ndbapi/NdbConnection.hpp:
        Auto merged
      ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      4cff6feb
    • unknown's avatar
      make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh: · 3a4372d3
      unknown authored
        Removed references to ISAM and MERGE
      
      
      mysql-test/mysql-test-run.sh:
        Removed references to ISAM and MERGE
      scripts/make_binary_distribution.sh:
        Removed references to ISAM and MERGE
      scripts/make_win_src_distribution.sh:
        Removed references to ISAM and MERGE
      3a4372d3
    • unknown's avatar
      Many files: · b0f963f5
      unknown authored
        Removed references to ISAM and MERGE
      
      
      netware/BUILD/compile-linux-tools:
        Removed references to ISAM and MERGE
      netware/Makefile.am:
        Removed references to ISAM and MERGE
      os2/ChangeLog.os2:
        Removed references to ISAM and MERGE
      os2/MySQL-Source.icc:
        Removed references to ISAM and MERGE
      os2/MySQL-Sql.icc:
        Removed references to ISAM and MERGE
      os2/MySQL-Util.icc:
        Removed references to ISAM and MERGE
      support-files/debian/gomi:
        Removed references to ISAM and MERGE
      b0f963f5
    • unknown's avatar
      prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw: · 6c5c48b5
      unknown authored
        Removed references to ISAM and MERGE
      
      
      VC++Files/mysql.dsw:
        Removed referenses to ISAM and MERGE
      VC++Files/sql/mysqld.dsp:
        Removed referenses to ISAM and MERGE
      VC++Files/sql/mysqldmax.dsp:
        Removed referenses to ISAM and MERGE
      VC++Files/winmysqladmin/winmysqladmin.cpp:
        Removed referenses to ISAM and MERGE
      VC++Files/prepare:
        Removed referenses to ISAM and MERGE
      6c5c48b5
    • unknown's avatar
      ndb - removed deprecated Ndb constructor · 11a2a356
      unknown authored
      
      ndb/include/ndbapi/Ndb.hpp:
        removed deprecated methods
      ndb/src/ndbapi/NdbPool.cpp:
        removed deprecated methods
      ndb/src/ndbapi/NdbPoolImpl.cpp:
        removed deprecated methods
      ndb/src/ndbapi/NdbPoolImpl.hpp:
        removed deprecated methods
      ndb/src/ndbapi/Ndbinit.cpp:
        removed deprecated methods
      ndb/tools/delete_all.cpp:
        removed deprecated methods
      ndb/tools/desc.cpp:
        removed deprecated methods
      ndb/tools/drop_index.cpp:
        removed deprecated methods
      ndb/tools/drop_tab.cpp:
        removed deprecated methods
      ndb/tools/restore/consumer_restore.cpp:
        removed deprecated methods
      ndb/tools/restore/consumer_restore.hpp:
        removed deprecated methods
      ndb/tools/restore/restore_main.cpp:
        removed deprecated methods
      ndb/tools/select_all.cpp:
        removed deprecated methods
      ndb/tools/select_count.cpp:
        removed deprecated methods
      11a2a356
    • unknown's avatar
      ndb - post merge fixes · a61ef102
      unknown authored
      
      ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
        merge
      a61ef102
    • unknown's avatar
      merge · 2a5aa24f
      unknown authored
      
      configure.in:
        Auto merged
      ndb/include/ndbapi/NdbApi.hpp:
        Auto merged
      ndb/include/ndbapi/NdbReceiver.hpp:
        Auto merged
      ndb/include/transporter/TransporterRegistry.hpp:
        Auto merged
      ndb/src/common/logger/Logger.cpp:
        Auto merged
      ndb/src/common/mgmcommon/IPCConfig.cpp:
        Auto merged
      ndb/src/common/transporter/Transporter.hpp:
        Auto merged
      ndb/src/kernel/main.cpp:
        Auto merged
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      ndb/src/mgmsrv/main.cpp:
        Auto merged
      ndb/src/ndbapi/Ndb.cpp:
        Auto merged
      ndb/src/ndbapi/NdbBlob.cpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ndb/src/ndbapi/NdbTransaction.cpp:
        Auto merged
      ndb/src/ndbapi/Ndbinit.cpp:
        Auto merged
      ndb/test/ndbapi/testBlobs.cpp:
        Auto merged
      2a5aa24f
    • unknown's avatar
      ndb - more removal of old constructor usage in test prgs · a142cea8
      unknown authored
      
      ndb/test/ndbapi/flexAsynch.cpp:
        new constructor
      ndb/test/ndbapi/flexHammer.cpp:
        new constructor
      ndb/test/ndbapi/flexTT.cpp:
        new constructor
      ndb/test/ndbapi/slow_select.cpp:
        new constructor
      ndb/test/ndbapi/testDeadlock.cpp:
        new constructor
      ndb/test/ndbapi/testLcp.cpp:
        new constructor
      a142cea8
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · 3fef20e2
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      3fef20e2
  4. 31 Dec, 2004 20 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9c92a255
      unknown authored
      into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
      
      
      mysql-test/r/user_limits.result:
        Auto merged
      mysql-test/t/user_limits.test:
        Auto merged
      9c92a255
    • unknown's avatar
      post-merge · 31c4511d
      unknown authored
      31c4511d
    • unknown's avatar
      manually merged · b99bea67
      unknown authored
      
      configure.in:
        Auto merged
      client/mysqldump.c:
        Auto merged
      innobase/buf/buf0rea.c:
        Auto merged
      innobase/dict/dict0load.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/include/fil0fil.h:
        Auto merged
      innobase/include/row0mysql.h:
        Auto merged
      innobase/include/trx0trx.h:
        Auto merged
      innobase/os/os0file.c:
        Auto merged
      innobase/row/row0ins.c:
        Auto merged
      innobase/row/row0mysql.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      innobase/srv/srv0start.c:
        Auto merged
      innobase/trx/trx0trx.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/grant_cache.result:
        Auto merged
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/r/ndb_blob.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/timezone2.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      mysql-test/t/multi_update.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      ndb/src/ndbapi/NdbBlob.cpp:
        Auto merged
      ndb/src/ndbapi/NdbConnection.cpp:
        Auto merged
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisammrg.cc:
        Auto merged
      sql/ha_myisammrg.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/strfunc.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      vio/vio.c:
        Auto merged
      vio/viosocket.c:
        Auto merged
      b99bea67
    • unknown's avatar
      row0upd.c: · 6b393398
      unknown authored
        Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version
      
      
      innobase/row/row0upd.c:
        Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version
      6b393398
    • unknown's avatar
      Make test results independent on who runs them · 21166957
      unknown authored
      21166957
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · bd23099b
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-debug-31dec
      
      
      bd23099b
    • unknown's avatar
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17ea3429
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
      
      
      17ea3429
    • unknown's avatar
      Fix test results to account for difference between release BDB, debug BDB and MyISAM. · 3cbfd4d9
      unknown authored
      
      mysql-test/t/bdb.test:
        Fix test results to account for difference in results caused by different FP calculation results
        between release BDB and debug BDB
      3cbfd4d9
    • unknown's avatar
      Yet another after merge fix. · da2c2b9c
      unknown authored
      Now max_user_connections is 36th field in mysql.user table
      (two new SP-related privileges were added).
      
      
      da2c2b9c
    • unknown's avatar
      post-merge · 5eaf65ab
      unknown authored
      
      mysql-test/r/grant2.result:
        new test case
      mysql-test/r/variables.result:
        don't fail w/o innodb
      mysql-test/t/grant2.test:
        new test case
      mysql-test/t/multi_update.test:
        don't fail w/o innodb
      mysql-test/t/variables.test:
        don't fail w/o innodb
      sql/sql_acl.cc:
        cleanup
      5eaf65ab
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-5.0 · ede69a75
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ede69a75
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ead0873
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-1339
      
      
      4ead0873
    • unknown's avatar
      Merge mysql.com:/dbdata/psergey/mysql-5.0-bug7264 · 21189edb
      unknown authored
      into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
      
      
      21189edb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7979cbd3
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      7979cbd3
    • unknown's avatar
      Fix max_key_length and max_unique_length to take into account varchar and null extra lengths · 7ea744f7
      unknown authored
      This fixes a bug found by bdb.test
      Fixes a portability issue with bdb tables
      
      
      mysql-test/include/varchar.inc:
        Fix test to be reproducable
        (Either key v or v_2 could be used here)
      mysql-test/r/bdb.result:
        Fix test to be reproducable
        (Either key v or v_2 could be used here)
      mysql-test/r/myisam.result:
        Fix test to be reproducable
        (Either key v or v_2 could be used here)
      sql/table.cc:
        Fix max_key_length and max_unique_length to take into account varchar and null extra lengths
        This fixes a bug found by bdb.test
      7ea744f7
    • unknown's avatar
      Manual merge. · efe5d60e
      unknown authored
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      efe5d60e
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 15f84399
      unknown authored
      into mysql.com:/Users/mikron/mysql-5.0
      
      
      ndb/src/kernel/blocks/suma/Suma.cpp:
        Auto merged
      15f84399
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 34e3b421
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0-ndb
      
      
      ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      34e3b421
    • unknown's avatar
      merge · 0d873308
      unknown authored
      0d873308