1. 27 Jul, 2006 2 commits
    • unknown's avatar
      BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB" · 94ebe8cb
      unknown authored
      recommented the uncommented have_innodb.inc line
      
      federated_transactions.test:
         BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
        slight ommission fixed
      
      
      mysql-test/t/federated_transactions.test:
         BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
        slight ommission fixed
      94ebe8cb
    • unknown's avatar
      BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB" · 8634c6b6
      unknown authored
      Changed federated_transactions.test to use InnoDB instead of BDB
      
      federated_transactions-slave.opt:
        BitKeeper file /home/patg/mysql-build/mysql-5.1-engines-bug21118/mysql-test/t/federated_transactions-slave.opt
      federated_transactions.result:
        BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
        New test results for InnoDB being remote transactional table
      federated_transactions.test:
        BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
        Changed remote transactional table from BDB to InnoDB
      
      
      mysql-test/t/federated_transactions.test:
        BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
        Changed remote transactional table from BDB to InnoDB
      mysql-test/r/federated_transactions.result:
        BUG #21118 "Federated Transaction test needs to have BDB switched to InnoDB"
        New test results for InnoDB being remote transactional table
      mysql-test/t/federated_transactions-slave.opt:
        BitKeeper file /home/patg/mysql-build/mysql-5.1-engines-bug21118/mysql-test/t/federated_transactions-slave.opt
      8634c6b6
  2. 26 Jul, 2006 2 commits
  3. 25 Jul, 2006 1 commit
  4. 24 Jul, 2006 4 commits
    • unknown's avatar
      After merge fix · 87acac5f
      unknown authored
      87acac5f
    • unknown's avatar
      After merge fix · 99a4775c
      unknown authored
      99a4775c
    • unknown's avatar
      After merge fix · 79ebad89
      unknown authored
      79ebad89
    • unknown's avatar
      Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 · 93528f28
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-amerge
      
      
      mysql-test/r/merge.result:
        Auto merged
      mysql-test/t/merge.test:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      configure.in:
        Manual merge
      mysql-test/extra/binlog_tests/blackhole.test:
        Manual merge
      mysql-test/r/binlog_stm_blackhole.result:
        Manual merge
      sql/ha_myisammrg.cc:
        Manual merge
      sql/handler.h:
        Manual merge
      storage/blackhole/ha_blackhole.cc:
        Manual merge
      support-files/mysql.spec.sh:
        Manual merge
      93528f28
  5. 23 Jul, 2006 2 commits
    • unknown's avatar
      BUG#20294 Instance manager test im_instance_conf fails randomly · 7b2cabd9
      unknown authored
      (well, im_options in this case, but using existing bug report)
      
      
      mysql-test/t/disabled.def:
        disable im_options test as it's non-deterministic. reopen bug
      7b2cabd9
    • unknown's avatar
      Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main · 299b620d
      unknown authored
      into  willster.(none):/home/stewart/Documents/MySQL/5.1/main
      
      
      BitKeeper/etc/config:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testDict.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      mysql-test/Makefile.am:
        manual merge
      storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
        manual merge
      299b620d
  6. 22 Jul, 2006 4 commits
  7. 21 Jul, 2006 1 commit
  8. 20 Jul, 2006 4 commits
    • unknown's avatar
      Bug#19939 · ca78b386
      unknown authored
        AUTHORS and CONTRIBUTORS are not reserved keywords.
      
      
      mysql-test/r/keywords.result:
        Bug#19939
          Test for bug
      mysql-test/t/keywords.test:
        Bug#19939
          Test for bug
      ca78b386
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-mmerge · 05fc3f10
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-amain
      
      
      configure.in:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      libmysqld/libmysqld.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/r/func_sapdb.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/gis-rtree.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/key.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/func_sapdb.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      mysql-test/t/key.test:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_geofunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_sum.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_create.c:
        Auto merged
      storage/myisam/mi_dynrec.c:
        Auto merged
      storage/myisam/mi_key.c:
        Auto merged
      storage/ndb/include/kernel/GlobalSignalNumbers.h:
        Auto merged
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Auto merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
        Manual merge
      include/my_sys.h:
        Manual merge
      mysql-test/t/federated.test:
        Manual merge
      sql/ha_federated.cc:
        Manual merge
      tests/Makefile.am:
        Manual merge
      05fc3f10
    • unknown's avatar
      Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-mrg · 013ecd59
      unknown authored
      into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-mrg
      
      
      sql/ha_ndbcluster.cc:
        SCCS merged
      sql/handler.h:
        SCCS merged
      sql/sql_update.cc:
        SCCS merged
      storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
        SCCS merged
      storage/ndb/include/ndbapi/NdbScanOperation.hpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        SCCS merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        SCCS merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        SCCS merged
      storage/ndb/src/ndbapi/NdbScanOperation.cpp:
        SCCS merged
      013ecd59
    • unknown's avatar
      BUG20733: Bug in partition pruning with zerofill field · d3b743ae
      unknown authored
      Problem was with handling NULL values in ranges
      
      
      mysql-test/r/partition_hash.result:
        New partition pruning test cases
      mysql-test/r/partition_list.result:
        New partition pruning test cases
      mysql-test/r/partition_pruning.result:
        New partition pruning test cases
      mysql-test/r/partition_range.result:
        New partition pruning test cases
      mysql-test/t/partition_hash.test:
        New partition pruning test cases
      mysql-test/t/partition_list.test:
        New partition pruning test cases
      mysql-test/t/partition_pruning.test:
        New partition pruning test cases
      mysql-test/t/partition_range.test:
        New partition pruning test cases
      sql/opt_range.cc:
        Added comment
      sql/sql_partition.cc:
        Partition pruning didn't handle ranges with NULL values in a proper manner
      d3b743ae
  9. 18 Jul, 2006 5 commits
    • unknown's avatar
      Merge lmy004.:/work/mysql-5.1-runtime · e8697194
      unknown authored
      into  lmy004.:/work/mysql-5.1-clean
      
      
      e8697194
    • unknown's avatar
      Fix windows build of libmysqld. Curious why pushbuild did not · d090462a
      unknown authored
      catch that.
      Stale CMakeLists.txt
      
      
      libmysqld/CMakeLists.txt:
        event_executor.cc is no more since a lot of time. it has
        been superseeded by event_scheduler.cc
      d090462a
    • unknown's avatar
      after merge fix · 410a2621
      unknown authored
      410a2621
    • unknown's avatar
      Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge · 7f70e111
      unknown authored
      into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
      
      
      mysql-test/r/sp_notembedded.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      sql/handler.h:
        manual merge
      sql/table.cc:
        manual merge
      sql/unireg.cc:
        manual merge
      tests/mysql_client_test.c:
        SCCS merged
      7f70e111
    • unknown's avatar
      BUG#20340: NODEGROUP in information_schema.partitions integer => · 0036ab8c
      unknown authored
      error in error log when "default is put into it
      NODEGROUP string to cater for "default" in it
      
      
      mysql-test/r/ndb_partition_key.result:
        New test case
      mysql-test/t/ndb_partition_key.test:
        New test case
      sql/sql_show.cc:
        NODEGROUP string to cater for "default" in it
      0036ab8c
  10. 17 Jul, 2006 2 commits
  11. 15 Jul, 2006 13 commits