Commit graph

9,101 commits

Author SHA1 Message Date
unknown
12443de1b2 WL#3259 (RBR with more columns on slave than on master):
Extended replication to allow extra columns added last on slave
as compared with table on master.


mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Testing that replication can handle extra extra columns on slave.
mysql-test/r/rpl_row_tabledefs.result:
  Result file change
sql/Makefile.am:
  Adding new files.
sql/field.cc:
  Implementing missing Field_bit::set_default()
sql/field.h:
  Implementing missing Field_bit::set_default()
sql/log_event.cc:
  Extending unpack_row() and replace_record() to handle the case when there are more columns
  on the slave than on the master. Especially handle BIT columns correctly.
  Using newly introduced table_def class to perform comparison.
sql/log_event.h:
  Adding field to table_map_log_event. Changing prototype for do_prepare_row().
sql/mysql_priv.h:
  Adding include guards
mysql-test/t/rpl_row_tabledefs.test:
  New BitKeeper file ``mysql-test/t/rpl_row_tabledefs.test''
sql/rpl_utility.cc:
  New BitKeeper file ``sql/rpl_utility.cc''
sql/rpl_utility.h:
  New BitKeeper file ``sql/rpl_utility.h''
2006-05-03 15:00:38 +02:00
unknown
cbdc730ae5 Fixed timeing problem by ignoring failures and results from first select after table definition change
mysql-test/r/ndb_alter_table2.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe
mysql-test/r/ndb_alter_table_stm.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe
2006-04-19 12:21:33 +03:00
unknown
97cddd4a30 Only run test with row based logging 2006-04-19 11:20:11 +03:00
unknown
c83dce6e34 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
2006-04-19 11:42:41 +05:00
unknown
2b49181d2f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1


include/my_sys.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysys/my_access.c:
  SCCS merged
2006-04-19 09:50:17 +05:00
unknown
c6590081c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-19 09:22:04 +05:00
unknown
73c03f8ae9 Fixing a merge from a few days ago.
Without a flush this test is nondeterministic for "row" binlog-format.


mysql-test/r/innodb.result:
  Without a flush this test is nondeterministic for "row" binlog-format.
mysql-test/t/innodb.test:
  Without a flush this test is nondeterministic for "row" binlog-format.
2006-04-17 18:57:01 -04:00
unknown
feb80054f0 ndb - bug#16796
storage/ndb/src/ndbapi/NdbBlob.cpp:
  set part id from main table op (may not be complete fix)
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  log partition id set/get
2006-04-17 20:24:41 +02:00
unknown
1540407e60 Fixed a few pieces around support for data directory.
mysql-test/r/archive.result:
  Adding test case for data directory support in create table.
mysql-test/t/archive.test:
  Added test for "data directory" support in archive.
sql/ha_archive.cc:
  Updated comments, added printable bits for support of "data directory"
sql/ha_archive.h:
  Added real_path to share (will come in handy in later code)
2006-04-16 21:55:02 -07:00
unknown
288fdada03 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-15 09:47:33 -04:00
unknown
2ffd95c4c9 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752
2006-04-14 17:50:32 -04:00
unknown
0988e2c80f Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752


mysql-test/t/partition.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
sql/share/errmsg.txt:
  manual merge
2006-04-14 17:48:27 -04:00
unknown
6588858552 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


client/mysql.cc:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
2006-04-14 13:33:02 -04:00
unknown
3e21b9d0da Hand-merged test. 2006-04-14 11:39:36 -04:00
unknown
c0b172f0b1 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

(With hand-merged tests.)


sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-04-14 11:38:09 -04:00
unknown
7280f8befb Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
2006-04-14 13:57:46 +05:00
unknown
9faa297074 Merge mysql.com:/usr/home/bar/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319


mysql-test/r/xml.result:
  Auto merged
mysql-test/t/xml.test:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged
2006-04-14 13:34:18 +05:00
unknown
1b2312211f update 2006-04-13 23:26:02 +03:00
unknown
5f23cd24fc Bug#19074: rpl_row_func003 test failed
disabled for now.


mysql-test/t/disabled.def:
  disabled.
2006-04-13 19:02:49 +03:00
unknown
72d64fefd4 retested all disabled ndb tests in pushbuild for 5+ runs and updated disabled.def accordingly 2006-04-13 15:34:38 +02:00
unknown
e0d67eadf5 BUG#18976 test workaround 2006-04-13 15:16:02 +02:00
unknown
23e0fa2164 disabled tests with accurate bug reports 2006-04-13 13:31:14 +02:00
unknown
4b277da5a2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


client/mysqltest.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
2006-04-13 10:48:24 +02:00
unknown
377fd67842 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-04-12 20:41:40 +02:00
unknown
ac37624269 disabled.def:
Disabled 'rpl_deadlock_innodb', randomly failing


mysql-test/t/disabled.def:
  Disabled 'rpl_deadlock_innodb', randomly failing
2006-04-12 20:38:08 +02:00
unknown
e0d66c3a11 Merge 2006-04-12 20:19:40 +02:00
unknown
52372838e0 disabled.def:
To somplify merge later, make files more similar in format


mysql-test/t/disabled.def:
  To somplify merge later, make files more similar in format
2006-04-12 20:06:15 +02:00
unknown
226ac7eb07 test update 2006-04-12 19:38:40 +02:00
unknown
c37ddbe9ad diabling tests with correct bug number 2006-04-12 18:51:10 +02:00
unknown
2a07ed9610 increase save_master_pos timeout to 30 seconds for higher test predictability
better replicaiton test cleanup to ensure better test predictability
+ some ndb test cleanup


client/mysqltest.c:
  increase save_master_pos timeout to 30 seconds for higher test predictability
mysql-test/extra/rpl_tests/rpl_ddl.test:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/r/rpl_ndb_dd_advance.result:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/r/rpl_ndb_sync.result:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/t/disabled.def:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_bank.test:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_basic.test:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_dd_advance.test:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_dd_basic.test:
  better replicaiton test cleanup to ensure better test predictability
mysql-test/t/rpl_ndb_sync.test:
  better replicaiton test cleanup to ensure better test predictability
2006-04-12 15:55:41 +02:00
unknown
b4111c4d51 Bug#18736 test case 'upgrade' fails
"upgrade" failed on windows, because of lower_case_table_name.
This fix changes letters to lower case, not to depend on OS.

Note, this change does not affect coverage of 
Bug N 17142 "Crash if create with encoded name",
which the test war originally written for.


mysql-test/r/upgrade.result:
  Changing "P" to "p" not to depend on lower_case_table_name
mysql-test/t/upgrade.test:
  Changing "P" to "p" not to depend on lower_case_table_name
2006-04-12 14:45:37 +05:00
unknown
777165ccd2 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18285
2006-04-12 13:31:04 +05:00
unknown
087cae1a1e Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-11 16:03:49 -07:00
unknown
a3fb002177 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
2006-04-11 18:25:13 -04:00
unknown
53e47e3bd0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
2006-04-11 16:39:09 -04:00
unknown
16002370c6 Merge mysql.com:/home/jimw/my/mysql-5.1-17139
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/sql_parse.cc:
  Auto merged
2006-04-11 12:06:49 -07:00
unknown
9338013163 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18285
2006-04-12 00:06:48 +05:00
unknown
39bf253c0e Removed test case erroneously merged from 5.0 2006-04-11 23:06:47 +04:00
unknown
ee5e33148e Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
2006-04-11 15:00:06 -04:00
unknown
5d224206a5 Merge mysql.com:/home/alexi/bugs/mysql-5.0-13683
into  mysql.com:/home/alexi/bugs/mysql-5.1-13683


mysql-test/r/insert.result:
  Null-merge
sql/sql_insert.cc:
  Null-merge
2006-04-11 22:59:03 +04:00
unknown
c97aa492e5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b14360
2006-04-11 23:46:27 +05:00
unknown
8907bf0af7 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/bugs/mysql-5.0-merge


sql/sql_insert.cc:
  Auto merged
2006-04-11 22:46:26 +04:00
unknown
a2beafcb0b fix so that rpl_row_basic_8partition.test is only run when paritioning is enabled
mysql-test/t/rpl_row_basic_8partition.test:
  this test requires partitioning
2006-04-11 15:38:32 +02:00
unknown
3649074e6d Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
2006-04-11 09:36:02 -04:00
unknown
aa3eb77e62 bug#17870 Table names conflict with Windows device names
It was impossible to create some table names on Windows
(e.g. LPT1, AUX, COM1, etc).

Fixed to pad dangerous names with thee "at" signs
(e.g. LPT1@@@, AUX@@@, COM1@@@, and so on).


include/my_sys.h:
  Adding new function declaration
mysys/my_access.c:
  Adding new function check_if_legal_tablename().
  It works almost like check_if_legal_filename(),
  but accepts a table name without extension and path,
  and does not check "CLOCK$".
sql/sql_table.cc:
  Check if a dangerous table name and append @@@
strings/ctype-utf8.c:
  Treat "@@@" sequence in a table name as a end-of-line.
mysql-test/r/ctype_filename.result:
  New BitKeeper file ``mysql-test/r/ctype_filename.result''
mysql-test/t/ctype_filename.test:
  New BitKeeper file ``mysql-test/t/ctype_filename.test''
2006-04-11 18:16:14 +05:00
unknown
961725aa51 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b14360
2006-04-11 18:14:34 +05:00
unknown
1655d73c45 Merge mysql.com:/usr/home/bar/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18285


mysql-test/r/xml.result:
  Auto merged
mysql-test/t/xml.test:
  Auto merged
2006-04-11 17:12:29 +05:00
unknown
1ef739636a Fix for bug #14360: Date Between Interval Broken.
mysql-test/r/innodb.result:
  Fix for bug #14360: Date Between Interval Broken.                               
    - test case.
mysql-test/t/innodb.test:
  Fix for bug #14360: Date Between Interval Broken.                               
    - test case.
sql/item_timefunc.cc:
  Fix for bug #14360: Date Between Interval Broken.                               
    - Item_date_add_interval::eq() introduced.
sql/item_timefunc.h:
  Fix for bug #14360: Date Between Interval Broken.                               
    - Item_date_add_interval::eq() introduced.
2006-04-11 16:13:57 +05:00
unknown
3d860b131a Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2006-04-11 12:41:26 +02:00
unknown
c73df2254f Merge 192.168.0.10:mysql/mysql-5.1
into  shellback.:C:/mysql/my51-bug17368


sql/ha_partition.cc:
  Auto merged
2006-04-11 12:19:28 +02:00