Commit f8ddd2b2 authored by unknown's avatar unknown
Browse files

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/space/pekka/ndb/version/my51
parents b3d7c316 bac7f104

client/mysqlimport.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ pthread_handler_t worker_thread(void *arg) 
  pthread_mutex_lock(&counter_mutex);

  counter--;

  pthread_mutex_unlock(&counter_mutex);

  return error;

  return 0;

}

mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

+19 −1
Original line number Diff line number Diff line
@@ -250,5 +250,23 @@ show binlog events from 102; 
do release_lock("lock1");

drop table t0,t2;





# End of 4.1 tests



# Test for BUG#16559 (ROLLBACK should always have a zero error code in

# binlog). Has to be here and not earlier, as the SELECTs influence

# XIDs differently between normal and ps-protocol (and SHOW BINLOG

# EVENTS above read XIDs).



connect (con4,localhost,root,,);

connection con3;

reset master;

create table t1 (a int) engine=innodb;

create table t2 (a int) engine=myisam;

select get_lock("a",10);

begin;

insert into t1 values(8);

insert into t2 select * from t1;

disconnect con3;



connection con4;

select get_lock("a",10); # wait for rollback to finish

mysql-test/r/binlog_row_mix_innodb_myisam.result

+24 −0
Original line number Diff line number Diff line
@@ -281,3 +281,27 @@ master-bin.000001 1092 Write_rows 1 # 
master-bin.000001	1126	Query	1	#	use `test`; create table t2 (n int) engine=innodb

do release_lock("lock1");

drop table t0,t2;

reset master;

create table t1 (a int) engine=innodb;

create table t2 (a int) engine=myisam;

select get_lock("a",10);

get_lock("a",10)

1

begin;

insert into t1 values(8);

insert into t2 select * from t1;

select get_lock("a",10);

get_lock("a",10)

1

select

(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null;

(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null

1

select

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"

1	1

drop table t1, t2;

mysql-test/r/binlog_stm_mix_innodb_myisam.result

+24 −0
Original line number Diff line number Diff line
@@ -256,3 +256,27 @@ master-bin.000001 1654 Query 1 # use `test`; create table t2 (n int) engine=inno 
master-bin.000001	1754	Query	1	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`

do release_lock("lock1");

drop table t0,t2;

reset master;

create table t1 (a int) engine=innodb;

create table t2 (a int) engine=myisam;

select get_lock("a",10);

get_lock("a",10)

1

begin;

insert into t1 values(8);

insert into t2 select * from t1;

select get_lock("a",10);

get_lock("a",10)

1

select

(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null;

(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))

is not null

1

select

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"

1	1

drop table t1, t2;

mysql-test/r/im_life_cycle.result

+4 −0
Original line number Diff line number Diff line
@@ -64,3 +64,7 @@ mysqld1 online 
mysqld2	offline

SHOW INSTANCE STATUS;

ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use

START INSTANCE mysqld1,mysqld2,mysqld3;

ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use

STOP INSTANCE mysqld1,mysqld2,mysqld3;

ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use