mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518

Browse source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@neptunus.(none) 2007-01-16 17:53:45 +01:00
commit 77b0123882
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client/mysqltest.c
View file

@ -5123,6 +5123,14 @@ end:
dynstr_free(&ds_execute_warnings);
}
/* Close the statement if - no reconnect, need new prepare */
if (mysql->reconnect)
{
mysql_stmt_close(stmt);
cur_con->stmt= NULL;
}
/*
We save the return code (mysql_stmt_errno(stmt)) from the last call sent
to the server into the mysqltest builtin variable $mysql_errno. This
@ -5928,6 +5936,8 @@ int main(int argc, char **argv)
break;
case Q_ENABLE_RECONNECT:
set_reconnect(&cur_con->mysql, 1);
/* Close any open statements - no reconnect, need new prepare */
close_statements();
break;
case Q_DISABLE_PARSING:
if (parsing_disabled == 0)

20
mysql-test/t/mix_innodb_myisam_binlog.test
View file

@ -29,7 +29,7 @@ insert into t2 select * from t1;
commit;
--replace_column 5 #
--replace_result "xid=15" "xid=8"
--replace_result "xid=14" "xid=8"
show binlog events from 98;
delete from t1;
@ -58,7 +58,7 @@ rollback to savepoint my_savepoint;
commit;
--replace_column 5 #
--replace_result "xid=48" "xid=25"
--replace_result "xid=47" "xid=25"
show binlog events from 98;
delete from t1;
@ -76,7 +76,7 @@ commit;
select a from t1 order by a; # check that savepoints work :)
--replace_column 5 #
--replace_result "xid=70" "xid=37"
--replace_result "xid=69" "xid=37"
show binlog events from 98;
# and when ROLLBACK is not explicit?
@ -109,7 +109,7 @@ insert into t1 values(9);
insert into t2 select * from t1;
--replace_column 5 #
--replace_result "xid=119" "xid=60"
--replace_result "xid=117" "xid=60"
show binlog events from 98;
# Check that when the query updat1ng the MyISAM table is the first in the
@ -122,13 +122,13 @@ insert into t1 values(10); # first make t1 non-empty
begin;
insert into t2 select * from t1;
--replace_column 5 #
--replace_result "xid=133" "xid=66"
--replace_result "xid=131" "xid=66"
show binlog events from 98;
insert into t1 values(11);
commit;
--replace_column 5 #
--replace_result "xid=133" "xid=66" "xid=136" "xid=68"
--replace_result "xid=131" "xid=66" "xid=134" "xid=68"
show binlog events from 98;
@ -147,7 +147,7 @@ insert into t2 select * from t1;
commit;
--replace_column 5 #
--replace_result "xid=155" "xid=78"
--replace_result "xid=153" "xid=78"
show binlog events from 98;
delete from t1;
@ -175,7 +175,7 @@ rollback to savepoint my_savepoint;
commit;
--replace_column 5 #
--replace_result "xid=187" "xid=94"
--replace_result "xid=185" "xid=94"
show binlog events from 98;
delete from t1;
@ -193,7 +193,7 @@ commit;
select a from t1 order by a; # check that savepoints work :)
--replace_column 5 #
--replace_result "xid=208" "xid=105"
--replace_result "xid=206" "xid=105"
show binlog events from 98;
# Test for BUG#5714, where a MyISAM update in the transaction used to
@ -254,7 +254,7 @@ disconnect con2;
connection con3;
select get_lock("lock1",60);
--replace_column 5 #
--replace_result "xid=208" "xid=105" "xid=227" "xid=114" "xid=230" "xid=115" "xid=234" "xid=117" "xid=261" "xid=132"
--replace_result "xid=206" "xid=105" "xid=224" "xid=114" "xid=227" "xid=115" "xid=231" "xid=117" "xid=258" "xid=132"
show binlog events from 98;
do release_lock("lock1");
drop table t0,t2;