Commit c29ae4ca authored by unknown's avatar unknown
Browse files

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 

into  dsl-hkigw8-fe00f800-98.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl


BitKeeper/etc/ignore:
  auto-union
parents 6e10407c 9c88f37b

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -776,6 +776,7 @@ mysql-test/r/udf.log 
mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/t/index_merge.load

mysql-test/t/rpl_truncate_4ndb.test

mysql-test/var

mysql-test/var/*

mysql.kdevprj

mysql-test/include/safe_set_to_maybe_ro_var.inc

0 → 100644
+23 −0
Original line number Diff line number Diff line 
# to mask out the error - never abort neither log in result file - in setting 

# to read-only variable.

# It is assumed that the new value is equal to one the var was set to.

# Such situation happens particularily with binlog_format that becomes read-only

# with ndb default storage.

#

# when generate results always watch the file to find what is expected,

# the SET query may fail



# script accepts $maybe_ro_var the var name and $val4var the value



### USAGE:

### let $maybe_ro_var= ...

### let $val4var= ...

### include/safe_set_to_maybe_ro_var.inc



--disable_result_log

--disable_abort_on_error

eval SET $maybe_ro_var = $val4var;

--enable_abort_on_error

--enable_result_log



eval SELECT $maybe_ro_var;

mysql-test/r/rpl_row_basic_8partition.result

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ reset slave; 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

DROP TABLE IF EXISTS t1;

SET BINLOG_FORMAT=ROW;

SET @@BINLOG_FORMAT = ROW;

SELECT @@BINLOG_FORMAT;

@@BINLOG_FORMAT

ROW

**** Partition RANGE testing ****

CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc VARCHAR(255), 

bc CHAR(255), d DECIMAL(10,4) DEFAULT 0,

mysql-test/t/rpl_rbr_to_sbr.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_row_based.inc

-- source include/have_binlog_format_mixed_or_statement.inc

-- source include/not_ndb_default.inc

-- source include/master-slave.inc



# Test that the slave temporarily switches to ROW when seeing binrow

mysql-test/t/rpl_row_basic_8partition.test

+6 −1
Original line number Diff line number Diff line
@@ -8,12 +8,17 @@ 
############################################################



--source include/have_row_based.inc

--source include/have_binlog_format_row.inc

--source include/have_partition.inc

--source include/not_ndb_default.inc

--source include/master-slave.inc

connection master;

--disable_warnings

DROP TABLE IF EXISTS t1;

SET BINLOG_FORMAT=ROW;



let $maybe_ro_var = @@BINLOG_FORMAT;

let $val4var = ROW;

--source include/safe_set_to_maybe_ro_var.inc



--echo **** Partition RANGE testing ****