- 22 Jan, 2008 2 commits
-
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb storage/ndb/src/ndbapi/Ndb.cpp: Using local, will merge manually. storage/ndb/include/ndbapi/Ndb.hpp: Changed parameter name to better reflect meaning.
-
unknown authored
Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node ndb_restore.result, ndb_restore.test: Changed test to use information_schema to check auto_increment DictCache.cpp, Ndb.cpp: Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node. When setting the auto_increment value we'll also read up the new value, this is useful if we use the table the first time in this MySQL Server and haven't yet seen the NEXTID value. The kernel will avoid updating since it already has the value but will also read up the NEXTID value to ensure we don't need to do this any more time. ndb_auto_increment.result: Updated result file since it was incorrect ndb/include/ndbapi/Ndb.hpp: Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node ndb/src/ndbapi/DictCache.hpp: Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node ndb/src/ndbapi/DictCache.cpp: Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node. When setting the auto_increment value we'll also read up the new value, this is useful if we use the table the first time in this MySQL Server and haven't yet seen the NEXTID value. The kernel will avoid updating since it already has the value but will also read up the NEXTID value to ensure we don't need to do this any more time. ndb/src/ndbapi/Ndb.cpp: Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node. When setting the auto_increment value we'll also read up the new value, this is useful if we use the table the first time in this MySQL Server and haven't yet seen the NEXTID value. The kernel will avoid updating since it already has the value but will also read up the NEXTID value to ensure we don't need to do this any more time. mysql-test/r/ndb_restore.result: Changed test to use information_schema to check auto_increment mysql-test/t/ndb_restore.test: Changed test to use information_schema to check auto_increment mysql-test/r/ndb_auto_increment.result: Updated result file since it was incorrect
-
- 11 Dec, 2007 4 commits
- 10 Dec, 2007 7 commits
-
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result: Auto merged mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result: manual merge mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result: manual merge
-
unknown authored
(bug not present in 5.1)
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge sql/ha_ndbcluster_binlog.cc: Auto merged
-
unknown authored
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
-
- 07 Dec, 2007 18 commits
-
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
mysql-test/mysql-test-run.pl: Add a way to remove options which mysql-test-run.pl no longer uses. Since mysql-test-run.pl passes unrecognized options through to mysqld directly, it is not possible to just remove an option. Otherwise it would be given to mysqld, which probably will not recognize it and will fail to start. Instead, we now explicitly ignore the option, and print a warning to the user.
-
unknown authored
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: Merge
-
unknown authored
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: Merge
-
unknown authored
-
unknown authored
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 sql/sql_table.cc: Auto merged
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/grant.result: Manual merge mysql-test/t/grant.test: Manual merge
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 sql/sql_table.cc: Auto merged
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge mysql-test/t/grant.test: Auto merged sql/sql_select.cc: Auto merged strings/ctype-simple.c: Auto merged mysql-test/r/grant.result: Manual merge
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 strings/ctype-simple.c: use local (null merge)
-
unknown authored
mysql-test/r/grant.result: Update test results to .test changes mysql-test/t/grant.test: Drop users when done with them, to avoid skewing results of later tests. For example, running some test which examines the cardinality of the mysql.user table would fail if run right after this test, due to the extra users.
-
unknown authored
-
unknown authored
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb storage/ndb/include/kernel/signaldata/TcKeyRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged sql/ha_ndbcluster.cc: Merge storage/ndb/src/ndbapi/NdbOperationExec.cpp: Merge
-
unknown authored
-
unknown authored
testing embedded server works correctly. mysql-test/r/create.result: Move one test from create.test to grant.test, because it actually tests privileges (and thus doesn't work with embedded server). mysql-test/r/grant.result: Move one test from create.test to grant.test, because it actually tests privileges (and thus doesn't work with embedded server). mysql-test/t/create.test: Move one test from create.test to grant.test, because it actually tests privileges (and thus doesn't work with embedded server). mysql-test/t/grant.test: Move one test from create.test to grant.test, because it actually tests privileges (and thus doesn't work with embedded server).
-
- 06 Dec, 2007 3 commits
-
-
unknown authored
sql/sql_select.cc: Fix compiler warning (probably harmless, wrong integer size)
-
unknown authored
strings/ctype-simple.c: Backport quick fix to remove Windows compiler warnings.
-
unknown authored
bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts
-
- 05 Dec, 2007 6 commits
-
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge client/mysqldump.c: Auto merged include/my_sys.h: Auto merged libmysql/CMakeLists.txt: Auto merged libmysql/Makefile.shared: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/suite/binlog/t/binlog_killed.test: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/func_misc.test: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_strfunc.h: Auto merged sql/item_timefunc.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/sort.c: Auto merged strings/ctype-simple.c: Auto merged
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50 mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged sql/set_var.cc: Auto merged
-
unknown authored
mysql-test/t/ctype_ucs.test: Post-merge fix (fix order of tests to match results).
-
unknown authored
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged libmysql/CMakeLists.txt: Auto merged libmysql/Makefile.shared: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/suite/rpl/t/rpl_ssl.test: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_timefunc.cc: Auto merged sql/opt_range.cc: Auto merged sql/records.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/unireg.cc: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/sort.c: Auto merged mysql-test/t/log_state.test: Manual merge fix-up mysql-test/include/mix1.inc: Manual merge mysql-test/r/ctype_ucs.result: Manual merge mysql-test/r/func_misc.result: Manual merge mysql-test/r/innodb_mysql.result: Manual merge mysql-test/r/key.result: Manual merge mysql-test/r/log_state.result: Manual merge mysql-test/suite/binlog/t/binlog_killed.test: Manual merge mysql-test/t/ctype_ucs.test: Manual merge mysql-test/t/func_misc.test: Manual merge mysql-test/t/key.test: Manual merge sql/item_strfunc.h: Manual merge strings/ctype-simple.c: Manual merge
-
unknown authored
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
-
unknown authored
Only select entries from the general_log that were issued by the current connection. mysql-test/r/log_tables.result: Update test result. mysql-test/t/log_tables.test: Only select entries from the current thread.
-