← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/include/mix1.inc

  • Committer: Monty Taylor
  • Date: 2010-06-19 16:36:52 UTC
  • mto: This revision was merged to the branch mainline in revision 1628.
  • Revision ID: mordred@inaugust.com-20100619163652-6fej38011wsop52k
Moved password parsing code into get_password.cc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/include/mix1.inc
26
26
#
27
27
 
28
28
eval SET SESSION STORAGE_ENGINE = $engine_type;
29
 
SET @orig_lock_wait_timeout= @@innodb_lock_wait_timeout; 
30
 
SET GLOBAL innodb_lock_wait_timeout=2;
31
 
 
32
29
 
33
30
--disable_warnings
34
31
drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
408
405
EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
409
406
SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
410
407
DELETE FROM t1;
411
 
--replace_column 9 #
412
408
EXPLAIN SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
413
409
SELECT DISTINCT t1.name, t1.dept FROM t1 WHERE t1.name='rs5';
414
410
 
915
911
set global innodb_autoextend_increment=8;
916
912
set global innodb_autoextend_increment=@my_innodb_autoextend_increment;
917
913
 
918
 
# BUG: 
919
 
# set @my_innodb_commit_concurrency=@@global.innodb_commit_concurrency;
920
 
# set global innodb_commit_concurrency=0;
921
 
# set global innodb_commit_concurrency=@my_innodb_commit_concurrency;
 
914
set @my_innodb_commit_concurrency=@@global.innodb_commit_concurrency;
 
915
set global innodb_commit_concurrency=0;
 
916
set global innodb_commit_concurrency=@my_innodb_commit_concurrency;
922
917
 
923
918
--echo End of 5.0 tests
924
919
 
1096
1091
DROP TABLE t2;
1097
1092
DROP TABLE t1;
1098
1093
 
1099
 
SET GLOBAL innodb_lock_wait_timeout=@orig_lock_wait_timeout ;
1100
 
 
1101
1094
--echo End of 5.1 tests