Commit graph

496 commits

Author SHA1 Message Date
bar@bar.myoffice.izhnet.ru
70488d7dfe Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl-merge
2007-10-30 12:03:34 +04:00
joerg@trift2.
c836873a8f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-10-29 23:13:28 +01:00
joerg@trift2.
77c4bfe63a Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-10-29 12:56:48 +01:00
joerg@trift2.
408727615c Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-29 11:55:48 +01:00
mleich@four.local.lan
f85bf63ce7 Fix for
Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
  
Reason for the changes is:
  WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE
2007-10-29 09:31:13 +01:00
gshchepa/uchum@gleb.loc
bf2bb35430 Many files:
Error message numbers.
2007-10-28 11:30:36 +04:00
gshchepa/uchum@gleb.loc
5ebb07a8c0 rpl_row_tabledefs_2myisam.result, sp.result, rpl_row_colSize.result:
Error message numbers.
2007-10-28 02:09:24 +04:00
gshchepa/uchum@gleb.loc
6fbac59c5c Many files:
Error message numbers.
2007-10-27 01:40:48 +05:00
mleich@four.local.lan
d3e18cc9bb Fix for
Bug#31408 funcs_1: <engine>_trig_03e test fail
Modification:
   The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
   Therefore after REVOKE TRIGGER privilege the 
   - SHOW TRIGGERS
   - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
   result sets are now empty.
2007-10-26 17:36:22 +02:00
msvensson@pilot.mysql.com
6d1f99b7d6 Bug#28772 rpl_row_until fails in pushbuild 2007-10-26 16:11:20 +02:00
tomas@whalegate.ndb.mysql.com
39b1aaed0f commit of WL#3686 test case already in 5.1 to get regression testing, no code committed 2007-10-26 11:42:33 +02:00
jonas@perch.ndb.mysql.com
85a9b350a6 post merge weirdness 2007-10-26 09:06:18 +02:00
jonas@perch.ndb.mysql.com
512ad385db Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-26 08:57:10 +02:00
aelkin/elkin@koti.dsl.inet.fi
c1f751ba9b Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug30594-rpl.rpl_skip_error_is_nondeterministic
2007-10-25 19:28:38 +03:00
kaa@polly.(none)
63ca7570af Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-24 21:39:00 +04:00
mats@kindahl-laptop.dnsalias.net
71bd1522e0 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bk/b24860-mysql-5.1-rpl
2007-10-24 16:54:18 +02:00
mats@kindahl-laptop.dnsalias.net
b9de3ce2a9 BUG#31702 (Missing row on slave causes assertion failure under row-based
replication):

Incremental patch to enable idempotency support for update events again.
The final handling of errors will be done in BUG#31609, and until then
the handling of errors should be consistent between the different types
of changes.
2007-10-24 16:02:37 +02:00
mskold/marty@linux.site
588b05d599 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-10-24 14:10:36 +02:00
aelkin/elkin@koti.dsl.inet.fi
271c98d067 Bug #30594 rpl.rpl_skip_error is nondeterministic
Non-determinism in the tests was due to results of SBR are different from those gained
with row binlog format.

Because tests effectively verify skipping only ER_DUP_ENTRY it is explicitly required
to run the test on in mixed and stmt binlog format.
ER_DUP_ENTRY is automatically ignored when happened in RBR because of implicit rule
favoring reentrant reading from binlog rule
which means that a Write_rows_log_event overwrites a slave's row
if the one has the same primary key.

If future we might have skipping error due to applying of row-based events.
The comments added saying a new file would be needed for that: rpl_row_skip_error or smth.
2007-10-22 21:45:21 +03:00
mats@kindahl-laptop.dnsalias.net
b65a9888c0 Post-merge fixes. 2007-10-22 10:32:35 +02:00
mats@kindahl-laptop.dnsalias.net
105a9c3e67 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl
2007-10-22 08:50:08 +02:00
mats@kindahl-laptop.dnsalias.net
012bccc09f BUG#24860 (Incorrect SLAVE_TRANSACTION_RETRIES code can result in slave stuck):
If a temporary error occured inside a group on an event that was not the first
event of the group, the slave could get stuck because the retry counter is reset
whenever an event was executed successfully.

This patch only reset the retry counter when an entire group has been successfully
executed, or failed with a non-transient error.
2007-10-20 20:16:12 +02:00
mats@kindahl-laptop.dnsalias.net
24ea15a24d Bug#31702 (Missing row on slave causes assertion failure under row-based replication):
When replicating an update pair (before image, after image) under row-based
replication, and the before image is not found on the slave, the after image
was not discared, and was hence read as a before image for the next row.
Eventually, this lead to an after image being read outside the block of rows
in the event, causing an assertion to fire.

This patch fixes this by reading the after image in the event that the row
was not found on the slave, adds some extra debug assertion to catch future
errors earlier, and also adds a few non-debug checks to prevent reading
outside the block of the event.
2007-10-20 18:19:55 +02:00
mats@kindahl-laptop.dnsalias.net
f2ba11c327 BUG#28618 (Skipping into the middle of a group with SQL_SLAVE_SKIP_COUNTER
is possible):

When skipping the beginning of a transaction starting with BEGIN, the OPTION_BEGIN
flag was not set correctly, which caused the slave to not recognize that it was
inside a group. This patch sets the OPTION_BEGIN flag for BEGIN, COMMIT, ROLLBACK,
and XID events. It also adds checks if inside a group before decreasing the
slave skip counter to zero.

Begin_query_log_event was not marked that it could not end a group, which is now
corrected.
2007-10-19 14:18:41 +02:00
mleich@four.local.lan
09e1c1b0a7 Merge four.local.lan:/WORK2/merge/mysql-5.1-31556
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
2007-10-18 16:14:27 +02:00
gkodinov/kgeorge@magare.gmz
7f8c4aacf6 Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt
2007-10-18 15:57:59 +03:00
mleich@four.local.lan
78c900107f Merge four.local.lan:/WORK2/merge/mysql-5.0-31556
into  four.local.lan:/WORK2/merge/mysql-5.1-31556
2007-10-18 13:13:21 +02:00
mleich@four.local.lan
8957e54a13 Fix for
Bug#31556 Test failure: "select hex(ascii(a)) ... order by a" results in different order
2007-10-18 13:09:30 +02:00
gluh@mysql.com/eagle.(none)
7f67efccef Bug#31568 Some "information_schema" entries suddenly report a NULL default
updated result files
2007-10-17 13:22:34 +05:00
skozlov/ksm@mysql.com/virtop.localdomain
253bb96e79 Fix for non-deterministic behavior of SELECTs and VIEWs 2007-10-16 23:19:39 +04:00
mleich@four.local.lan
714e2091c5 Fix for
Bug#31169 Test case does not check whether configuration contains feature tested
2007-10-15 17:04:43 +02:00
jonas@perch.ndb.mysql.com
69cce99bb6 ndb - reenable disabled testcases
ndb_load
  ndb_dd_sql_features
2007-10-15 09:17:15 +02:00
mskold/marty@linux.site
f92959dea5 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-10-15 08:51:35 +02:00
aelkin/elkin@koti.dsl.inet.fi
8f7550ecad manual merge for bug_29136, bug#29309. 2007-10-13 23:12:50 +03:00
aelkin/elkin@koti.dsl.inet.fi
a7b1a823a5 Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug29136-mdelete
into  koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
2007-10-13 16:51:16 +03:00
mats@kindahl-laptop.dnsalias.net
d32c1d616e Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
2007-10-12 13:24:28 +02:00
mats@kindahl-laptop.dnsalias.net
d8adc641a0 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bk/b29549-mysql-5.1-target-5.1.22
2007-10-12 09:40:24 +02:00
mleich@four.local.lan
6f2d47db9e Fix for
Bug#31411 funcs_1: ndb_<every test> fail because of changed server error number
= Adjust the files with expected results
2007-10-11 19:39:18 +02:00
mats@kindahl-laptop.dnsalias.net
c4298a3fb9 BUG#29549 (Endians: test failures on Solaris):
Refactoring code to add parameter to pack() and unpack() functions with
purpose of indicating if data should be packed in little-endian or
native order. Using new functions to always pack data for binary log
in little-endian order. The purpose of this refactoring is to allow
proper implementation of endian-agnostic pack() and unpack() functions.

Eliminating several versions of virtual pack() and unpack() functions
in favor for one single virtual function which is overridden in
subclasses.

Implementing pack() and unpack() functions for some field types that
packed data in native format regardless of the value of the
st_table_share::db_low_byte_first flag.

The field types that were packed in native format regardless are:
Field_real, Field_decimal, Field_tiny, Field_short, Field_medium,
Field_long, Field_longlong, and Field_blob.

Before the patch, row-based logging wrote the rows incorrectly on
big-endian machines where the storage engine defined its own
low_byte_first() to be FALSE on big-endian machines (the default
is TRUE), while little-endian machines wrote the fields in correct
order. The only known storage engine that does this is NDB. In effect,
this means that row-based replication from or to a big-endian
machine where the table was using NDB as storage engine failed if the
other engine was either non-NDB or on a little-endian machine.

With this patch, row-based logging is now always done in little-endian
order, while ORDER BY uses the native order if the storage engine
defines low_byte_first() to return FALSE for big-endian machines.

In addition, the max_data_length() function available in Field_blob
was generalized to the entire Field hierarchy to give the maximum
number of bytes that Field::pack() will write.
2007-10-11 18:18:05 +02:00
mleich@four.local.lan
6a1a424f6f Merge four.local.lan:/WORK2/merge/mysql-5.1-parts
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
2007-10-10 22:51:35 +02:00
mleich@four.local.lan
88047100af Combined fix for
Bug#31481 test suite parts: Many tests fail because of changed server error codes
   Bug#31243 Test "partition_basic_myisam" truncates path names
+ minor cleanup
2007-10-10 22:03:10 +02:00
sven@murkla.(none)
c302f74da6 BUG#29046: rpl_stm_mystery22 unstable
Problem: rpl_stm_mystery22 is unstable.

Reason: At one place, the test case *should* wait until the SQL thread on the
slave receives an error, but instead it waits until the SQL thread stops. The
SQL thread may stop before the error flag is set, so that when the test case
continues to execute, the error flag is not set.

Fix: Introduce the subroutine mysql-test/include/wait_for_slave_sql_error.inc,
which waits until there is an error in the sql thread of the slave.

Re-commit: fixed one logical error and two smaller things noted by Mats.
2007-10-10 18:10:54 +02:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
cc62b34061 rpl_ndb_extraColMaster.test, rpl_ndb_extraColMaster.result:
Back porting NDB test case
2007-10-10 17:22:21 +02:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
44352e16ad .del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba:
Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
  Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
  Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
Many files:
  merged and cleanup of test cases
2007-10-10 16:43:20 +02:00
mleich@four.local.lan
7c38ffe393 Fix for
Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results
2007-10-10 15:37:33 +02:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
ae700296b5 rpl_bug31076.test, rpl_bug31076.result:
Correcting test bug
2007-10-10 14:18:34 +02:00
gluh@eagle.(none)
27762854ef Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-10 14:33:46 +05:00
gluh@eagle.(none)
3023ee9401 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-10 12:37:06 +05:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
4bb09aecd4 Updated NDB test to run for both RBR and MBR testing. In addition added test for Innodb and updated results files for all tests. 2007-10-09 19:51:57 +02:00
pekka@sama.ndb.mysql.com
f83a1beb71 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
2007-10-09 13:16:49 +02:00