mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
49589d0ae2
Merge 2744:2837 from branches/5.1 (skipping r2782 and r2826):
------------------------------------------------------------------------
r2832 | vasil | 2008-10-21 10:08:30 +0300 (Tue, 21 Oct 2008) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
In ha_innobase::info():
Replace sql_print_warning() which prints to mysqld error log with
push_warning_printf() which sends the error message to the client.
Suggested by: Marko, Sunny, Michael
Objected by: Inaam
------------------------------------------------------------------------
r2837 | vasil | 2008-10-21 12:07:44 +0300 (Tue, 21 Oct 2008) | 32 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-semi-consistent.result
M /branches/5.1/mysql-test/innodb-semi-consistent.test
M /branches/5.1/mysql-test/innodb.result
M /branches/5.1/mysql-test/innodb.test
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb and
innodb-semi-consistent tests):
revno: 2757
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: B39812-5.1-5.1.29-rc
timestamp: Fri 2008-10-03 15:24:19 +0300
message:
Bug #39812: Make statement replication default for 5.1 (to match 5.0)
Make STMT replication default for 5.1.
Add a default of MIXED into the config files
Fix the tests that needed MIXED replication mode.
modified:
mysql-test/include/mix1.inc
mysql-test/r/innodb-semi-consistent.result
mysql-test/r/innodb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/tx_isolation_func.result
mysql-test/t/innodb-semi-consistent.test
mysql-test/t/innodb.test
mysql-test/t/tx_isolation_func.test
sql/mysqld.cc
support-files/my-huge.cnf.sh
support-files/my-innodb-heavy-4G.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
support-files/my-small.cnf.sh
------------------------------------------------------------------------
52 lines
1.3 KiB
Text
52 lines
1.3 KiB
Text
-- source include/not_embedded.inc
|
|
-- source include/have_innodb.inc
|
|
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
# basic tests of semi-consistent reads
|
|
|
|
connect (a,localhost,root,,);
|
|
connect (b,localhost,root,,);
|
|
connection a;
|
|
set binlog_format=mixed;
|
|
set session transaction isolation level read committed;
|
|
create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1;
|
|
insert into t1 values (1),(2),(3),(4),(5),(6),(7);
|
|
set autocommit=0;
|
|
# this should lock the entire table
|
|
select * from t1 where a=3 lock in share mode;
|
|
connection b;
|
|
set binlog_format=mixed;
|
|
set session transaction isolation level read committed;
|
|
set autocommit=0;
|
|
-- error ER_LOCK_WAIT_TIMEOUT
|
|
update t1 set a=10 where a=5;
|
|
connection a;
|
|
commit;
|
|
connection b;
|
|
update t1 set a=10 where a=5;
|
|
connection a;
|
|
-- error ER_LOCK_WAIT_TIMEOUT
|
|
select * from t1 where a=2 for update;
|
|
# this should lock the records (1),(2)
|
|
select * from t1 where a=2 limit 1 for update;
|
|
connection b;
|
|
update t1 set a=11 where a=6;
|
|
-- error ER_LOCK_WAIT_TIMEOUT
|
|
update t1 set a=12 where a=2;
|
|
-- error ER_LOCK_WAIT_TIMEOUT
|
|
update t1 set a=13 where a=1;
|
|
connection a;
|
|
commit;
|
|
connection b;
|
|
update t1 set a=14 where a=1;
|
|
commit;
|
|
connection a;
|
|
select * from t1;
|
|
drop table t1;
|
|
|
|
connection default;
|
|
disconnect a;
|
|
disconnect b;
|