1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

19270 Commits

Author SHA1 Message Date
unknown
a0091f6474 Additional fix for bug N26402:
An attempt to open file with name '????????.frm'
can produce different errors:
- ER_NO_SUCH_TABLE on Unix
- ER_FILE_NOT_FOUND on Windows
because QUESTION MARK has special meaning on Windows.
Make sure that any of these two errors happens.


mysql-test/r/show_check.result:
  Additional fix for bug N26402
mysql-test/t/show_check.test:
  Additional fix for bug N26402
2007-06-15 11:53:46 +05:00
unknown
1805b34e04 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862


mysql-test/r/csv.result:
  After merge fix
mysql-test/t/csv.test:
  After merge fix
storage/csv/ha_tina.cc:
  After merge fix
2007-06-15 11:27:10 +05:00
unknown
39700afdb9 Bug#28862 Extended Latin1 characters get lost in CVS engine
Problem: Temporary buffer which is used for quoting and escaping
  was initialized to character set utf8, and thus didn't allow
  to store data in other character sets.
  Fix: changing character set of the buffer to be able to
  store any arbitrary sequence of bytes.


mysql-test/r/csv.result:
  Adding test case
mysql-test/t/csv.test:
  Adding test case
sql/examples/ha_tina.cc:
  Changing character set of the buffer to "binary".
2007-06-15 11:19:35 +05:00
unknown
36f8bfb22e Fixed bug #27932: the function LOCATE returned NULL if any
of its arguments was evaluated to NULL, while the predicate
LOCATE(str,NULL) IS NULL erroneously was evaluated to FALSE.

This happened because the Item_func_locate::fix_length_and_dec
method by mistake set the value of the maybe_null flag for 
the function item to 0. In consequence of this the function 
was considered as the one that could not ever return NULL.


mysql-test/r/func_str.result:
  Added a test case for bug #27932.
mysql-test/t/func_str.test:
  Added a test case for bug #27932.
2007-06-14 18:55:07 -07:00
unknown
b8b23fed43 Merge damien-katzs-computer.local:/Users/dkatz/mysql51
into  damien-katzs-computer.local:/Users/dkatz/51_win


sql/sql_parse.cc:
  Auto merged
2007-06-14 20:48:11 -04:00
unknown
4df04e1ad2 Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/51
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


sql/sql_select.cc:
  Auto merged
2007-06-15 02:36:37 +02:00
unknown
e64172b9e5 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51


configure.in:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/ctype_ucs_binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/drop_temp_table.test:
  Auto merged
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog_stm_binlog.result:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/have_log_bin.require:
  Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
  Auto merged
mysql-test/t/insert_update.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Use local
mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/date_formats.test:
  Use local
mysql-test/t/ndb_basic.test:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/user_var-binlog.test:
  use local
2007-06-15 01:57:33 +02:00
unknown
f97b8c9978 Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6
into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
2007-06-14 16:04:52 -07:00
unknown
0a91dbcf53 BUG#28971 - ALTER TABLE followed by UPDATE for a CSV table
make server crash

UPDATE against CSV table may cause server crash or update a table with wrong
values.

CSV can write only a whole row at once. That means it must read all columns,
that it is not going to update, and write them along with updated columns.
But only limited set of columns was read, those that were needed for the
UPDATE query.

With this fix all columns are read in case we're performing an UPDATE.


mysql-test/r/csv.result:
  A test case for BUG#28971.
mysql-test/t/csv.test:
  A test case for BUG#28971.
  Flush tables is here just to make crash more probable. If we remove it,
  fields will have old values from previous query and server won't crash.
storage/csv/ha_tina.cc:
  CSV engine is not capable to update single column,
  because it can only write a row at once. Thus we must
  read all columns if a table is opened for update.
2007-06-15 03:22:40 +05:00
unknown
cb93ff4d02 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/binlog.result:
  Auto merged
mysql-test/r/have_log_bin.require:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932_notembedded.test:
  Auto merged
mysql-test/t/binlog.test:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/ctype_ucs_binlog.test:
  Auto merged
mysql-test/t/flush_block_commit_notembedded.test:
  Auto merged
mysql-test/t/insert_select-binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog-cp932.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Use local
mysql-test/t/blackhole.test:
  manual merge
mysql-test/t/drop_temp_table.test:
  manual merge
mysql-test/t/mix_innodb_myisam_binlog.test:
  Use local
mysql-test/t/mysqlbinlog.test:
  Use local
2007-06-14 23:23:30 +02:00
unknown
a3c2ebbcdd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 21:58:45 +02:00
unknown
d098bfffc1 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-27857
2007-06-14 12:00:14 -06:00
unknown
cc75d9eadf Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-06-14 19:08:46 +02:00
unknown
ec885d9caa Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
2007-06-14 18:43:29 +02:00
unknown
ebcbfef85f Bug #27640 backup id not displayed in the output of "ndb_mgm start backup wait completed"
- correction, missing node id
2007-06-14 18:40:32 +02:00
unknown
854353dd3c fix the binlog-stm_ps.test for the embedded-server
mysql-test/t/binlog_stm_ps.test:
  embedded server doesn't have binlogs
2007-06-14 20:33:57 +05:00
unknown
0d07520206 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-06-14 16:21:52 +02:00
unknown
d168b042a9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
2007-06-14 16:10:11 +02:00
unknown
d881c4fc87 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
2007-06-14 15:48:32 +02:00
unknown
edb853a63b Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2007-06-14 20:45:12 +08:00
unknown
103c1eeffe Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
2007-06-14 20:30:48 +08:00
unknown
6ead7eea29 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb


storage/ndb/include/debugger/EventLogger.hpp:
  Auto merged
storage/ndb/src/mgmclient/Makefile.am:
  Auto merged
2007-06-14 19:57:50 +08:00
unknown
0662a9b78a Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqltest.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/include/mix1.inc:
  merging
mysql-test/r/innodb_mysql.result:
  merging
sql/sql_select.cc:
  merging
2007-06-14 16:42:43 +05:00
unknown
6f168d1255 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


client/mysqltest.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/innodb_mysql.result:
  merging
mysql-test/t/innodb_mysql.test:
  merging
sql/sql_select.cc:
  merging
2007-06-14 16:41:10 +05:00
unknown
4daad4ebfe Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed"
ndb/include/debugger/EventLogger.hpp:
  add definition for new printLogEvent() function in CommandInterpreter.cpp
ndb/src/mgmclient/CommandInterpreter.cpp:
  add a printLogEvent() function to print log event;
  filter "<PING>" by ndb_logevent_get_next() in event_thread_run();
  filter "<PING>" by ndb_logevent_get_next() in executeStartBackup();
  and make executeStartBackup() same in both 5.0 and 5.1
ndb/src/mgmclient/Makefile.am:
  add link to use ndb_logevent_get_next()
mysql-test/r/ndb_backup_print.result:
  testcase result for ndb_backup_print
  produced by mysql_test_run.pl
mysql-test/t/ndb_backup_print.test:
  add testcase for ndb_mgm -e "start backup", check outupt format
2007-06-14 19:40:44 +08:00
unknown
95d439d375 Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-06-14 16:35:46 +05:00
unknown
167751b3f0 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/type_decimal.result:
  Auto merged
sql/item_func.cc:
  Auto merged
2007-06-14 16:35:20 +05:00
unknown
dd3ff42c54 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
Temporarily using thd_tx_isolation() until decision is made on how to
get the isolation level.


storage/innobase/handler/ha_innodb.cc:
  Using thd_tx_isolation() instead of direct access to variable.
mysql-test/r/binlog_tx_isolation.result:
  New BitKeeper file ``mysql-test/r/binlog_tx_isolation.result''
2007-06-14 13:33:31 +02:00
unknown
837ba138b1 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines
2007-06-14 16:28:34 +05:00
unknown
805c446ca4 Bug#26402 Server crashes with old-style named table
Problem: crash on attempt to open a table
  having "#mysql50#" prefix in db or table name.
  Fix: This prefix is reserved for "mysql_upgrade"
  to access 5.0 tables  whose file names are not encoded
  according to "5.1 tablename to filename encoded".
  Don't try open tables whose db name or table name
  has this prefix.


mysql-test/r/show_check.result:
  Adding test case.
mysql-test/t/show_check.test:
  Adding test case.
sql/mysql_priv.h:
  Moving 5.0 prefix declarations into mysql_priv.h
sql/sql_table.cc:
  Moving 5.0 prefix declarations into mysql_priv.h
sql/table.cc:
  Don't try to do "normal" open of tables having '#mysql50#' prefix in
  db or table name. This prefix is reserved to access to unencoded
  table names when upgrading from 5.0 to 5.1.
2007-06-14 16:28:33 +05:00
unknown
e1f5ce69b9 Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.1-engines


mysql-test/r/merge.result:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
2007-06-14 16:19:47 +05:00
unknown
5bc3eb2e11 BUG#26976 - Missing table in merge not noted in related error msg +
SHOW CREATE TABLE fails
Addition to the fix: report db name + table name instead of table path.
This solves embedded merge test failure.


mysql-test/r/merge.result:
  BUG#26976 - Missing table in merge not noted in related error msg +
              SHOW CREATE TABLE fails
  Addition to the fix: report db name + table name instead of table path.
sql/ha_myisammrg.cc:
  BUG#26976 - Missing table in merge not noted in related error msg +
              SHOW CREATE TABLE fails
  Addition to the fix: report db name + table name instead of table path.
2007-06-14 16:18:01 +05:00
unknown
28444ac8b1 Bug #29103 ndb_restore segfaults on NULL var[char|binary]
mysql-test/r/ndb_restore.result:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - add extra row with NULL value to test
mysql-test/t/ndb_restore.test:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - add extra row with NULL value to test
storage/ndb/tools/restore/consumer_restore.cpp:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - check that the attribute is not null
2007-06-14 12:51:13 +02:00
unknown
dcd779cb38 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28991-5.1-opt
2007-06-14 12:54:52 +03:00
unknown
37559e3db5 Bug #28991: rpl_events failure in pushbuild
In tests waiting on a timeout is not deterministic enough
to make sure that an event actually finished executing.
Fixed the test by waiting in a loop and checking the effect
that the event is supposed to produce.


mysql-test/include/rpl_events.inc:
  Bug #28991: wait until event has taken effect
2007-06-14 12:53:13 +03:00
unknown
e615aaff68 Add a missing wait_condition call.
mysql-test/t/events_restart_phase3.test:
  Add a missing wait.
2007-06-14 13:51:35 +04:00
unknown
f3dc047890 WL#3303 (RBR: Engine-controlled logging format):
Test case fixes.


mysql-test/r/binlog_multi_engine.result:
  Result change.
mysql-test/r/rpl_ndb_stm_innodb.result:
  Result change.
mysql-test/t/binlog_multi_engine.test:
  NDB tests only work in MIXED or ROW mode. Adding some cleanup actions.
mysql-test/t/loaddata_autocom_ndb.test:
  NDB requires MIXED or ROW mode.
mysql-test/t/ndb_alter_table.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_alter_table2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_alter_table3.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_autodiscover.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_autodiscover2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_autodiscover3.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_basic.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_binlog_log_bin.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_binlog_multi.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_bitfield.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_blob.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_blob_partition.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cache.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cache2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cache_multi.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cache_multi2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_charset.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_condition_pushdown.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_config.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_config2.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_cursor.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_database.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_alter.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_backuprestore.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_basic.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_ddl.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_disk2memory.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_dump.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_dd_sql_features.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_gis.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_index.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_index_ordered.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_index_unique.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_insert.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_limit.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_loaddatalocal.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_lock.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_minmax.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_multi.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_partition_error.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_partition_key.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_partition_list.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_partition_range.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_read_multi_range.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_rename.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_replace.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_restore.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_restore_partition.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_restore_print.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_row_format.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_single_user.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_sp.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_subquery.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_temporary.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_transaction.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_trigger.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_truncate.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_types.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_update.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndb_view.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ndbapi.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/ps_7ndb.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/rpl_ndb_commit_afterflush.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/rpl_ndb_innodb_trans.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
mysql-test/t/rpl_ndb_stm_innodb.test:
  We need MIXED mode on slave since it is necessary to let the slave
  switch to row format when executing replicated statements.
mysql-test/t/strict_autoinc_5ndb.test:
  NDB requires MIXED or ROW mode, but will switch to row format
  automatically, so we only run these tests under ROW mode.
2007-06-14 11:05:48 +02:00
unknown
b1516976f0 Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures
- touch up


mysql-test/include/wait_for_slave_io_to_stop.inc:
  Update comment
  Remove superfluous variable assignments
2007-06-14 08:48:00 +02:00
unknown
e6a8ce327d Merge bk-internal:/home/bk/mysql-5.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-14 08:38:49 +02:00
unknown
8b8b28881f Bug#27857 (Log tables supplies the wrong value for generating AUTO_INCREMENT
numbers)

Before this patch, the code in the class Log_to_csv_event_handler, which is
used by the global LOGGER object to write to the tables mysql.slow_log and
mysql_general_log, was supporting only records of the format defined for
these tables in the database creation scripts.

Also before this patch, the server would allow, with certain limitations,
to perform ALTER TABLE on the LOG TABLES.

As implemented, the behavior of the server, with regards to LOG TABLES,
is inconsistent:
- either ALTER TABLES on LOG TABLES should be prohibited,
and the code writing to these tables can make assumptions on the record
format,
- or ALTER TABLE on LOG TABLES is permitted, in which case the code
writing a record to these tables should be more flexible and honor
new fields.

In particular, adding an AUTO_INCREMENT column to the logs,
does not work as expected (per the bug report).

Given that the ALTER TABLE on log tables statement has been explicitly
implemented to check that the log should be off to perform the operation,
and that current test cases already cover this, the user expectation is
already set that this is a "feature" and should be supported.

With this patch, the server will:
- populate AUTO INCREMENT columns if present,
- populate any additional column with it's default value
when writing a record to the LOG TABLES.

Tests are provided, that detail the precise sequence of statements
a SUPER user might want to perform to add more columns to the log tables.


mysql-test/r/log_tables.result:
  Test case for bug#27857
mysql-test/t/log_tables.test:
  Test case for bug#27857
sql/log.cc:
  Set extra fields in log tables with default values.
2007-06-13 22:05:22 -06:00
unknown
8c617a3b01 Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/mysql51


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-06-13 16:37:16 -04:00
unknown
31608f67ab Bug #28953 Using events in a replication let the slave crash.
Fixed where the slave code would try to update the Lex->sphead which is NULL on an "alter table" commands.


mysql-test/r/rpl_events.result:
  test that "alter event" replicates without crashing the slave
mysql-test/t/rpl_events.test:
  test that "alter event" replicates without crashing the slave
sql/sql_parse.cc:
  Added a check for lex->spd, which isn't set on an "alter event" command
2007-06-13 16:24:21 -04:00
unknown
da4e864c7c Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into  damien-katzs-computer.local:/Users/dkatz/50_win
2007-06-13 15:47:34 -04:00
unknown
40ebf3b70b Bug #28897 UUID() returns non-unique values when query cache is enabled
Removed the ability to cache queries containing "UUID()".


mysql-test/r/query_cache.result:
  Added test to ensure "select UUID(), a from t1" is different each time.
mysql-test/t/query_cache.test:
  Added test to ensure "select UUID(), a from t1" is different each time.
sql/item_create.cc:
  Removed the ability to cache queries with UUID().
2007-06-13 14:23:25 -04:00
unknown
57cac5df09 rpl_known_bugs_detection.test:
Updated to use new tool(s):Missed on call, resubmitting


mysql-test/t/rpl_known_bugs_detection.test:
  Updated to use new tool(s):Missed on call, resubmitting
2007-06-13 19:52:42 +02:00
unknown
c0ebdff9c7 Fixed bug #28980: the result of ROUND(<decimal expr>,<int column>)
was erroneously converted to double, while the result of
ROUND(<decimal expr>, <int literal>) was preserved as decimal.
As a result of such a conversion the value of ROUND(D,A) could
differ from the value of ROUND(D,val(A)) if D was a decimal expression.

Now the result of the ROUND function is never converted to 
double if the first argument is decimal.  


mysql-test/r/type_decimal.result:
  Added a test case for bug #28980.
mysql-test/t/type_decimal.test:
  Added a test case for bug #28980.
2007-06-13 09:32:36 -07:00
unknown
93d01a659a Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/data2/mysql-5.1-maint
2007-06-13 17:44:21 +02:00
unknown
bef9666565 rpl_known_bugs_detection.test:
Updated to use new tool(s)


mysql-test/t/rpl_known_bugs_detection.test:
  Updated to use new tool(s)
2007-06-13 17:43:31 +02:00
unknown
ff3f8990e7 Disabled ascii-function
mysql-test/r/partition_bug18198.result:
  Disabled a lot of test cases using ascii-function
mysql-test/r/partition_charset.result:
  Disabled a lot of test cases using ascii-function
mysql-test/r/partition_error.result:
  Disabled a lot of test cases using ascii-function
mysql-test/r/partition_pruning.result:
  Disabled a lot of test cases using ascii-function
mysql-test/r/partition_range.result:
  Disabled a lot of test cases using ascii-function
mysql-test/t/partition_bug18198.test:
  Disabled a lot of test cases using ascii-function
mysql-test/t/partition_charset.test:
  Disabled a lot of test cases using ascii-function
mysql-test/t/partition_error.test:
  Disabled a lot of test cases using ascii-function
mysql-test/t/partition_pruning.test:
  Disabled a lot of test cases using ascii-function
mysql-test/t/partition_range.test:
  Disabled a lot of test cases using ascii-function
2007-06-13 17:28:59 +02:00
unknown
43fb390959 Merge dator6.(none):/home/mikael/mysql_clones/clean-mysql-5.1
into  dator6.(none):/home/mikael/mysql_clones/bug18198


mysql-test/t/partition_hash.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  manual merge
sql/item_cmpfunc.h:
  manual merge
sql/item_func.h:
  manual merge
sql/item_strfunc.h:
  manual merge
sql/item_timefunc.h:
  manual merge
sql/item_xmlfunc.h:
  manual merge
sql/partition_info.cc:
  manual merge
sql/sql_partition.cc:
  manual merge
2007-06-13 16:03:18 +02:00