mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
f0ae3ce9b9
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb
200 lines
4.2 KiB
Text
200 lines
4.2 KiB
Text
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
|
|
create table t1 (x integer not null primary key, y varchar(32)) engine = ndb;
|
|
insert into t1 values (1,'one'), (2,'two');
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
start transaction;
|
|
insert into t1 values (3,'three');
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
3 three
|
|
start transaction;
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
commit;
|
|
select * from t1 order by x;
|
|
x y
|
|
1 one
|
|
2 two
|
|
3 three
|
|
commit;
|
|
drop table t1;
|
|
create table t1 (pk integer not null primary key, u int not null, o int not null,
|
|
unique(u), key(o)) engine = ndb;
|
|
insert into t1 values (1,1,1), (2,2,2), (3,3,3), (4,4,4), (5,5,5);
|
|
lock tables t1 write;
|
|
delete from t1 where pk = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
lock tables t1 write;
|
|
delete from t1 where u = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
lock tables t1 write;
|
|
delete from t1 where o = 1;
|
|
unlock tables;
|
|
select * from t1 order by pk;
|
|
pk u o
|
|
2 2 2
|
|
3 3 3
|
|
4 4 4
|
|
5 5 5
|
|
insert into t1 values (1,1,1);
|
|
drop table t1;
|
|
create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
|
|
insert into t1 values (1,'one',1);
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
rollback;
|
|
insert into t1 values (2,'two',2),(3,"three",3);
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' for update;
|
|
x y z
|
|
# # #
|
|
# # #
|
|
begin;
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' order by x for update;
|
|
x y z
|
|
1 one 1
|
|
3 three 3
|
|
begin;
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where z > 1 and z < 3 for update;
|
|
x y z
|
|
2 two 2
|
|
begin;
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
Got one of the listed errors
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where x = 1 lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
begin;
|
|
select * from t1 where x = 1 lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' lock in share mode;
|
|
x y z
|
|
# # #
|
|
# # #
|
|
begin;
|
|
select * from t1 where y = 'one' lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where y = 'one' or y = 'three' order by x lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
3 three 3
|
|
begin;
|
|
select * from t1 where y = 'one' lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
x y z
|
|
2 two 2
|
|
select * from t1 where x = 1 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
begin;
|
|
select * from t1 where z > 1 and z < 3 lock in share mode;
|
|
x y z
|
|
2 two 2
|
|
begin;
|
|
select * from t1 where z = 1 lock in share mode;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 1 for update;
|
|
x y z
|
|
1 one 1
|
|
select * from t1 where x = 2 for update;
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
rollback;
|
|
commit;
|
|
drop table t1;
|
|
create table t3 (id2 int) engine=ndb;
|
|
lock tables t3 write;
|
|
unlock tables;
|
|
drop table t3;
|
|
create table t2 (id int, j int) engine=ndb;
|
|
insert into t2 values (2, 2);
|
|
create table t3 (id int) engine=ndb;
|
|
lock tables t3 read;
|
|
delete t2 from t2, t3 where t2.id = t3.id;
|
|
unlock tables;
|
|
drop table t2, t3;
|