1. 29 Jun, 2006 3 commits
  2. 28 Jun, 2006 6 commits
    • unknown's avatar
      ndb - · 42f61262
      unknown authored
        50->51 merge of bug#20442, force close scan (with locks)
      
      
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        merge
      42f61262
    • unknown's avatar
      ndb - · 52c32382
      unknown authored
        ndbapi test of bug#20252
      
      
      storage/ndb/test/ndbapi/testScan.cpp:
        ndbapi test of bug#20252
      52c32382
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7e39d48e
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      7e39d48e
    • unknown's avatar
      ndb - bug#20442 · d7534c3a
      unknown authored
        force close of scan (of outstanding scan_frag)
      
      
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Force close of scan in when not doing committed read scan
      d7534c3a
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/51-work · aef2cdd2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbScanOperation.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      storage/ndb/tools/restore/consumer_restore.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
        SCCS merged
      aef2cdd2
    • unknown's avatar
      Bug #20705 table truncation from one mysqld causes ERROR 1412 on other mysqld servers · 0ec6bb3f
      unknown authored
      - make sure to invalidate even if table is not binlogged
      
      
      0ec6bb3f
  3. 27 Jun, 2006 15 commits
    • unknown's avatar
      24cb5235
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 85a6c26c
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      85a6c26c
    • unknown's avatar
      62722a4d
    • unknown's avatar
      rpl_ndb_dd_partitions.test, rpl_ndb_dd_partitions.result: · ea7f1a61
      unknown authored
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
        new file
      
      
      mysql-test/r/rpl_ndb_dd_partitions.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/rpl_ndb_dd_partitions.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      ea7f1a61
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1 · eb8c3ade
      unknown authored
      into  mysql.com:/data0/mysql-5.1
      
      
      eb8c3ade
    • unknown's avatar
      Many files: · cea60fb1
      unknown authored
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
        new file
      
      
      mysql-test/t/ndb_partition_error.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_key.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_list.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_partition_range.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_blob_partition.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/t/ndb_dd_backuprestore.test:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_error.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_key.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_list.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_partition_range.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_blob_partition.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      mysql-test/r/ndb_dd_backuprestore.result:
        Adding back ndb partition tests from mysql-test-extra per tomas and clavin
      cea60fb1
    • unknown's avatar
      changed signature of get_default_no_partitions · d4cb502c
      unknown authored
      d4cb502c
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · 39fa14dd
      unknown authored
      - post merge fixes for 5.1
      
      
      39fa14dd
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · da70a12c
      unknown authored
      - post merge fixes for 5.1
      
      
      da70a12c
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · a0630577
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbScanOperation.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbReceiver.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        merge
      a0630577
    • unknown's avatar
      ndb - bug#20252 · f1056028
      unknown authored
        allow user to specify scan batch size in readTuples
      
      
      ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        Allow user to specify batch size
      ndb/include/ndbapi/NdbScanOperation.hpp:
        Allow user to specify batch size
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Fix so that last row works even if batch is complete
      ndb/src/ndbapi/NdbReceiver.cpp:
        Allow user yo specify batch size
      ndb/src/ndbapi/NdbScanOperation.cpp:
        Allow user to specify batchsize
      f1056028
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 89dbf165
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        manual merge
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        manual merge
      89dbf165
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · d2da3c96
      unknown authored
      - correction of previous patch
      
      
      d2da3c96
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 6848be9c
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/mysql-test-run.sh:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
        Auto merged
      storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
        Auto merged
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
        Auto merged
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        manual merge
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        manual merge
      storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
        manual merge
      storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
        manual merge
      storage/ndb/include/kernel/signaldata/TupFrag.hpp:
        manual merge
      storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/backup/Backup.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/backup/Backup.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        manual merge
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        manual merge
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        manual merge
      storage/ndb/tools/restore/Restore.cpp:
        manual merge
      storage/ndb/tools/restore/Restore.hpp:
        manual merge
      storage/ndb/tools/restore/consumer_restore.cpp:
        manual merge
      6848be9c
    • unknown's avatar
      Bug #19852 Restoring backup made from cluster with full data memory fails · 0335013f
      unknown authored
      - make sure to allocate just enough pages in the fragments by using the actual
        row count from the backup, to avoid over allocation of pages to fragments, and
        thus avoid the bug
      
      
      ndb/include/kernel/GlobalSignalNumbers.h:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - distribute fragment complete to all participants to update row count
      ndb/include/kernel/signaldata/BackupContinueB.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - time slica writing of fragment info to ctl file
      ndb/include/kernel/signaldata/BackupImpl.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
        - new signal fragment complete to all participants
      ndb/include/kernel/signaldata/BackupSignalData.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/include/kernel/signaldata/DictTabInfo.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add min and max rows to dict tab info
      ndb/include/kernel/signaldata/LqhFrag.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to add frag req
      ndb/include/kernel/signaldata/TupFrag.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to add frag req
      ndb/include/ndbapi/NdbDictionary.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added get/set of min max rows
      ndb/src/common/debugger/signaldata/BackupImpl.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bit on bytes and records
      ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to dict tab info
      ndb/src/common/debugger/signaldata/LqhFrag.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/Backup.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/BackupFormat.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new section in backup with per fragment info in ctl file
        - 32 -> 64 bit on bytes and records
      ndb/src/kernel/blocks/backup/BackupInit.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - new signal fragment complete to all participants
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added max and min rows to dict table object
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added max and min rows to dict table object
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
      ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - added min and max rows to frag req
        - move memory allocation to fragment to after adding of attributes to get correct headsize
        - allocate pages to fragments according to min rows setting
      ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - grow page allocation starting from 2 irrespective of first page allocation
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bits on bytes and records
      ndb/src/mgmsrv/MgmtSrvr.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - 32 -> 64 bits on bytes and records
      ndb/src/ndbapi/NdbDictionary.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - min and max rows in dict
      ndb/tools/restore/Restore.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add retrieval of fragment info
      ndb/tools/restore/Restore.hpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - add retrieval of fragment info
      ndb/tools/restore/consumer_restore.cpp:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - set min in restore to the actual row count (this is the actual bug fix)
      sql/ha_ndbcluster.cc:
        Bug #19852  	Restoring backup made from cluster with full data memory fails
        - set min and max rows according to sql definition
      0335013f
  4. 26 Jun, 2006 16 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 57f3f256
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/events_stress.test:
        Auto merged
      57f3f256
    • unknown's avatar
      Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1 · 91efca68
      unknown authored
      into  mysql.com:/data0/mysql-5.1
      
      
      91efca68
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · 98ba03d2
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      98ba03d2
    • unknown's avatar
      Merge mysql.com:/opt/local/work/tmp_merge · 313b46a0
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/sp-prelocking.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/ndberror.c:
        Auto merged
      strings/ctype-mb.c:
        Auto merged
      mysql-test/t/sp-prelocking.test:
        Manual merge.
      313b46a0
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · fee803af
      unknown authored
      into  mysql.com:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/events.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/t/events_microsec.test:
        SCCS merged
      fee803af
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.1-pristine · 6d8c855a
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp-5.1
      
      
      6d8c855a
    • unknown's avatar
      BUG#20676: debug warnings about too many lock waiters cause test failure. · 1ef08c91
      unknown authored
      The 250 simultaneous events all accessing the same table caused the
      events_stress test to fail due to debug warnings about too many table
      waiters. Fixed by using three different tables.
      
      
      mysql-test/r/events_stress.result:
        Use three different MyISAM tables to avoid debug warnings about too many
        locks.
      mysql-test/t/events_stress.test:
        Use three different MyISAM tables to avoid debug warnings about too many
        locks.
      1ef08c91
    • unknown's avatar
      ndb - bug#20053 · 90913a03
      unknown authored
        make sure we can only drop files from correct file group
      
      
      mysql-test/r/ndb_dd_ddl.result:
        add testcase
      mysql-test/t/ndb_dd_ddl.test:
        add testcase
      sql/ha_ndbcluster.cc:
        Make sure correct tablespace for dropping datafile
      storage/ndb/include/ndbapi/NdbDictionary.hpp:
        Cleanup {data/undo}file get{tablespace/logfilegroup}
      storage/ndb/src/ndbapi/NdbDictionary.cpp:
        Cleanup {data/undo}file get{tablespace/logfilegroup}
      storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
        Cleanup {data/undo}file get{tablespace/logfilegroup}
      storage/ndb/tools/restore/consumer_restore.cpp:
        Cleanup {data/undo}file get{tablespace/logfilegroup}
      90913a03
    • unknown's avatar
      ndb - bug#20683 · 9aa82e53
      unknown authored
        part 2 - handle safecounter.init() failing in all parts of event code
      
      
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Handle out safecounter.init() failing
      storage/ndb/src/kernel/blocks/suma/Suma.cpp:
        Dont try to get table RNIL
      storage/ndb/test/ndbapi/test_event.cpp:
        Add testcase for subscribe/unscubscribe
      9aa82e53
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 42169376
      unknown authored
      into lmy004.:/work/mysql-5.1-runtime-bug16992
      
      
      mysql-test/t/events.test:
        Auto merged
      mysql-test/t/events_grant.test:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      42169376
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · f9216751
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/51-work
      
      
      storage/ndb/src/kernel/vm/RequestTracker.hpp:
        Auto merged
      storage/ndb/src/kernel/vm/SafeCounter.hpp:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      f9216751
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 841a5b7a
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/vm/SafeCounter.hpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      841a5b7a
    • unknown's avatar
      ndb - bug#20683 · 7072a63a
      unknown authored
        part 1 - make sure return code is propagated from request tracker
      
      
      ndb/src/kernel/vm/RequestTracker.hpp:
        propagate return value
      ndb/src/kernel/vm/SafeCounter.hpp:
        make sure object is not initialized in case of seize() failure, to make sure destructor doesnt assert
      7072a63a
    • unknown's avatar
      Merge mysql.com:/usr/local/mysql/mysql-5.1-bug20549 · a5e194ed
      unknown authored
      into  mysql.com:/usr/local/mysql/tmp-5.1
      
      
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      a5e194ed
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · 9fe96d8f
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      9fe96d8f
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · c945766f
      unknown authored
      into lmy004.:/work/mysql-5.1-runtime-bug18897
      
      
      mysql-test/t/events_bugs.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      c945766f