← Back to branch summary

~dingqi-lxb/percona-server/5.5_log_queries_in_memory

« back to all changes in this revision

Viewing changes to patches/mysql-test.diff

  • Committer: dingqi.lxb at taobao
  • Date: 2012-01-01 03:46:09 UTC
  • mfrom: (198.3.2 percona-server)
  • Revision ID: dingqi.lxb@taobao.com-20120101034609-gohh9k05kvkqjzz8
merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/mysql-test.diff
1
 
--- a/mysql-test/include/default_mysqld.cnf
2
 
+++ b/mysql-test/include/default_mysqld.cnf
3
 
@@ -29,7 +29,7 @@
4
 
 max_heap_table_size=        1M
5
 
 
6
 
 loose-innodb_data_file_path=      ibdata1:10M:autoextend
7
 
-loose-innodb_buffer_pool_size=    8M
8
 
+loose-innodb_buffer_pool_size=    32M
9
 
 loose-innodb_write_io_threads=    2
10
 
 loose-innodb_read_io_threads=     2
11
 
 loose-innodb_log_buffer_size=     1M
12
1
--- a/mysql-test/r/connect.result
13
2
+++ b/mysql-test/r/connect.result
14
3
@@ -1,3 +1,4 @@
515
504
 unlock tables;
516
505
 drop procedure bug9486;
517
506
 drop table t1, t2;
518
 
--- a/mysql-test/suite/innodb/r/innodb.result
519
 
+++ b/mysql-test/suite/innodb/r/innodb.result
520
 
@@ -1664,7 +1664,7 @@
521
 
 drop table t1;
522
 
 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
523
 
 variable_value
524
 
-511
525
 
+2047
526
 
 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
527
 
 variable_value
528
 
 16384
529
507
--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
530
508
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
531
509
@@ -10,7 +10,6 @@
562
540
+set global log_warnings=1;
563
541
--- a/mysql-test/t/show_check.test
564
542
+++ b/mysql-test/t/show_check.test
565
 
@@ -1376,10 +1376,10 @@
 
543
@@ -1358,10 +1358,10 @@
566
544
 let $wait_timeout= 10;
567
545
 let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID();
568
546
 --source include/wait_condition.inc
651
629
+@@global.innodb_corrupt_table_action
652
630
+assert
653
631
--- /dev/null
654
 
+++ b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result
655
 
@@ -0,0 +1,3 @@
656
 
+SELECT @@global.innodb_dict_size_limit;
657
 
+@@global.innodb_dict_size_limit
658
 
+0
659
 
--- /dev/null
660
632
+++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result
661
633
@@ -0,0 +1,3 @@
662
634
+SELECT @@global.innodb_doublewrite_file;
663
635
+@@global.innodb_doublewrite_file
664
636
+NULL
665
637
--- /dev/null
666
 
+++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result
667
 
@@ -0,0 +1,3 @@
668
 
+SELECT @@global.innodb_fast_checksum;
669
 
+@@global.innodb_fast_checksum
670
 
+0
671
 
--- /dev/null
672
638
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result
673
639
@@ -0,0 +1,3 @@
674
640
+SELECT @@global.innodb_flush_neighbor_pages;
897
863
@@ -0,0 +1 @@
898
864
+SELECT @@global.innodb_corrupt_table_action;
899
865
--- /dev/null
900
 
+++ b/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test
901
 
@@ -0,0 +1 @@
902
 
+SELECT @@global.innodb_dict_size_limit;
903
 
--- /dev/null
904
866
+++ b/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test
905
867
@@ -0,0 +1 @@
906
868
+SELECT @@global.innodb_doublewrite_file;
907
869
--- /dev/null
908
 
+++ b/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test
909
 
@@ -0,0 +1 @@
910
 
+SELECT @@global.innodb_fast_checksum;
911
 
--- /dev/null
912
870
+++ b/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test
913
871
@@ -0,0 +1 @@
914
872
+SELECT @@global.innodb_flush_neighbor_pages;
1038
996
+SELECT @@global.userstat;
1039
997
--- a/mysql-test/suite/sys_vars/t/all_vars.test
1040
998
+++ b/mysql-test/suite/sys_vars/t/all_vars.test
1041
 
@@ -59,8 +59,8 @@
 
999
@@ -44,8 +44,8 @@
1042
1000
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
1043
1001
 eval load data infile "$MYSQLTEST_VARDIR/tmp/sys_vars.all_vars.txt" into table t1;
1044
1002
 
1049
1007
 
1050
1008
 # This is only present in debug builds.
1051
1009
 delete from t2 where variable_name='innodb_change_buffering_debug';
1052
 
@@ -77,7 +77,7 @@
 
1010
@@ -62,7 +62,7 @@
1053
1011
   where length(variable_name) > 50;
1054
1012
 
1055
1013
 select variable_name as `There should be *no* variables listed below:` from t2