← Back to branch summary

~rodrigo-gadea-percona/percona-server/ps-docs

« back to all changes in this revision

Viewing changes to patches/mysql-test.diff

  • Committer: Stewart Smith
  • Date: 2011-08-04 21:14:39 UTC
  • Revision ID: stewart@flamingspork.com-20110804211439-2d30rstk1v30xi19
fix all_vars test for removal of INNODB FAKE_CHANGES and KILL_IDLE_TRANSACTION

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/mysql-test.diff
1
 
diff -ruN a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
2
 
--- a/mysql-test/include/default_mysqld.cnf     2011-04-09 18:48:03.000000000 +0400
3
 
+++ b/mysql-test/include/default_mysqld.cnf     2011-04-09 18:49:05.000000000 +0400
 
1
--- a/mysql-test/include/default_mysqld.cnf
 
2
+++ b/mysql-test/include/default_mysqld.cnf
4
3
@@ -29,7 +29,7 @@
5
4
 max_heap_table_size=        1M
6
5
 
10
9
 loose-innodb_write_io_threads=    2
11
10
 loose-innodb_read_io_threads=     2
12
11
 loose-innodb_log_buffer_size=     1M
13
 
diff -ruN a/mysql-test/r/connect.result b/mysql-test/r/connect.result
14
 
--- a/mysql-test/r/connect.result       2011-04-09 18:48:03.000000000 +0400
15
 
+++ b/mysql-test/r/connect.result       2011-04-09 18:49:05.000000000 +0400
 
12
--- a/mysql-test/r/connect.result
 
13
+++ b/mysql-test/r/connect.result
16
14
@@ -1,3 +1,4 @@
17
15
+set global log_warnings=0;
18
16
 drop table if exists t1,t2;
23
21
 # -- End of 5.1 tests
24
22
 # ------------------------------------------------------------------
25
23
+set global log_warnings=1;
26
 
diff -ruN a/mysql-test/r/create.result b/mysql-test/r/create.result
27
 
--- a/mysql-test/r/create.result        2011-04-09 18:48:03.000000000 +0400
28
 
+++ b/mysql-test/r/create.result        2011-04-09 18:49:05.000000000 +0400
 
24
--- a/mysql-test/r/create.result
 
25
+++ b/mysql-test/r/create.result
29
26
@@ -1741,7 +1741,11 @@
30
27
   `COMMAND` varchar(16) NOT NULL DEFAULT '',
31
28
   `TIME` int(7) NOT NULL DEFAULT '0',
52
49
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8
53
50
 drop table t1;
54
51
 create table t1 like information_schema.character_sets;
55
 
diff -ruN a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
56
 
--- a/mysql-test/r/information_schema.result    2011-04-09 18:48:03.000000000 +0400
57
 
+++ b/mysql-test/r/information_schema.result    2011-04-09 18:49:05.000000000 +0400
 
52
--- a/mysql-test/r/information_schema.result
 
53
+++ b/mysql-test/r/information_schema.result
58
54
@@ -46,14 +46,17 @@
59
55
 select * from v1;
60
56
 c
266
262
 VIEWS  information_schema.VIEWS        1
267
263
 create table t1(f1 int);
268
264
 create view v1 as select f1+1 as a from t1;
269
 
diff -ruN a/mysql-test/r/information_schema_db.result b/mysql-test/r/information_schema_db.result
270
 
--- a/mysql-test/r/information_schema_db.result 2011-04-09 18:48:03.000000000 +0400
271
 
+++ b/mysql-test/r/information_schema_db.result 2011-04-09 18:49:05.000000000 +0400
 
265
--- a/mysql-test/r/information_schema_db.result
 
266
+++ b/mysql-test/r/information_schema_db.result
272
267
@@ -6,14 +6,17 @@
273
268
 show tables where Tables_in_information_schema NOT LIKE 'Innodb%';
274
269
 Tables_in_information_schema
319
314
 TRIGGERS
320
315
 create database `inf%`;
321
316
 create database mbase;
322
 
diff -ruN a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
323
 
--- a/mysql-test/r/mysqld--help-notwin.result   2011-04-09 18:48:03.000000000 +0400
324
 
+++ b/mysql-test/r/mysqld--help-notwin.result   2011-04-09 18:49:05.000000000 +0400
 
317
--- a/mysql-test/r/mysqld--help-notwin.result
 
318
+++ b/mysql-test/r/mysqld--help-notwin.result
325
319
@@ -250,21 +250,40 @@
326
320
  --log-slow-admin-statements 
327
321
  Log slow OPTIMIZE, ANALYZE, ALTER and other
493
487
 
494
488
 To see what values a running MySQL server is using, type
495
489
 'mysqladmin variables' instead of 'mysqld --verbose --help'.
496
 
diff -ruN a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
497
 
--- a/mysql-test/r/mysqldump.result     2011-04-09 18:48:03.000000000 +0400
498
 
+++ b/mysql-test/r/mysqldump.result     2011-04-09 18:49:05.000000000 +0400
 
490
--- a/mysql-test/r/mysqldump.result
 
491
+++ b/mysql-test/r/mysqldump.result
499
492
@@ -1832,7 +1832,7 @@
500
493
 # Bug#21288 mysqldump segmentation fault when using --where
501
494
 #
505
498
 mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server
506
499
 
507
500
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
508
 
diff -ruN a/mysql-test/r/mysqlshow.result b/mysql-test/r/mysqlshow.result
509
 
--- a/mysql-test/r/mysqlshow.result     2011-04-09 18:48:03.000000000 +0400
510
 
+++ b/mysql-test/r/mysqlshow.result     2011-04-09 18:49:05.000000000 +0400
 
501
--- a/mysql-test/r/mysqlshow.result
 
502
+++ b/mysql-test/r/mysqlshow.result
511
503
@@ -80,14 +80,17 @@
512
504
 |                Tables                 |
513
505
 +---------------------------------------+
639
631
 +---------------------------------------+
640
632
 Wildcard: inf_rmation_schema
641
633
 +--------------------+
642
 
diff -ruN a/mysql-test/r/select.result b/mysql-test/r/select.result
643
 
--- a/mysql-test/r/select.result        2011-04-09 18:48:03.000000000 +0400
644
 
+++ b/mysql-test/r/select.result        2011-04-09 18:49:05.000000000 +0400
 
634
--- a/mysql-test/r/select.result
 
635
+++ b/mysql-test/r/select.result
645
636
@@ -2196,10 +2196,10 @@
646
637
 select * from (t1 as t2 left join t1 as t3 using (a)) inner join t1 on t1.a>1;
647
638
 a      a
655
646
 3      3
656
647
 select * from t1 inner join (t1 as t2 left join t1 as t3 using (a)) on t1.a>1;
657
648
 a      a
658
 
diff -ruN a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
659
 
--- a/mysql-test/r/show_check.result    2011-04-09 18:48:03.000000000 +0400
660
 
+++ b/mysql-test/r/show_check.result    2011-04-09 18:49:05.000000000 +0400
 
649
--- a/mysql-test/r/show_check.result
 
650
+++ b/mysql-test/r/show_check.result
661
651
@@ -1538,14 +1538,14 @@
662
652
 SET NAMES latin1;
663
653
 SELECT GET_LOCK('t',1000) AS 'óóóó';;
679
669
 SELECT RELEASE_LOCK('t');
680
670
 RELEASE_LOCK('t')
681
671
 1
682
 
diff -ruN a/mysql-test/r/sp-threads.result b/mysql-test/r/sp-threads.result
683
 
--- a/mysql-test/r/sp-threads.result    2011-04-09 18:48:03.000000000 +0400
684
 
+++ b/mysql-test/r/sp-threads.result    2011-04-09 18:49:05.000000000 +0400
 
672
--- a/mysql-test/r/sp-threads.result
 
673
+++ b/mysql-test/r/sp-threads.result
685
674
@@ -33,11 +33,11 @@
686
675
 lock tables t2 write;
687
676
 call bug9486();
699
688
 unlock tables;
700
689
 drop procedure bug9486;
701
690
 drop table t1, t2;
702
 
diff -ruN a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
703
 
--- a/mysql-test/suite/innodb/r/innodb.result   2011-04-09 18:49:04.000000000 +0400
704
 
+++ b/mysql-test/suite/innodb/r/innodb.result   2011-04-09 18:49:05.000000000 +0400
 
691
--- a/mysql-test/suite/innodb/r/innodb.result
 
692
+++ b/mysql-test/suite/innodb/r/innodb.result
705
693
@@ -1664,7 +1664,7 @@
706
694
 drop table t1;
707
695
 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_buffer_pool_pages_total';
711
699
 SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size';
712
700
 variable_value
713
701
 16384
714
 
diff -ruN a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
715
 
--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result   2011-04-09 18:48:03.000000000 +0400
716
 
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result   2011-04-09 18:49:05.000000000 +0400
 
702
--- a/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
 
703
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_log_at_trx_commit_basic.result
717
704
@@ -10,7 +10,6 @@
718
705
 1
719
706
 '#---------------------FN_DYNVARS_046_02-------------------------#'
722
709
 SELECT @@innodb_flush_log_at_trx_commit;
723
710
 @@innodb_flush_log_at_trx_commit
724
711
 1
725
 
diff -ruN a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
726
 
--- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test     2011-04-09 18:48:03.000000000 +0400
727
 
+++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test     2011-04-09 18:49:05.000000000 +0400
 
712
--- a/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
 
713
+++ b/mysql-test/suite/sys_vars/t/innodb_flush_log_at_trx_commit_basic.test
728
714
@@ -56,7 +56,7 @@
729
715
 # Check if variable can be accessed with and without @@ sign                  #
730
716
 ###############################################################################
734
720
 SET innodb_flush_log_at_trx_commit = 1;
735
721
 SELECT @@innodb_flush_log_at_trx_commit;
736
722
 
737
 
diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test
738
 
--- a/mysql-test/t/connect.test 2011-04-09 18:48:03.000000000 +0400
739
 
+++ b/mysql-test/t/connect.test 2011-04-09 18:49:05.000000000 +0400
 
723
--- a/mysql-test/t/connect.test
 
724
+++ b/mysql-test/t/connect.test
740
725
@@ -1,3 +1,5 @@
741
726
+set global log_warnings=0;
742
727
+
748
733
 --source include/wait_until_count_sessions.inc
749
734
 
750
735
+set global log_warnings=1;
751
 
diff -ruN a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
752
 
--- a/mysql-test/t/show_check.test      2011-04-09 18:48:03.000000000 +0400
753
 
+++ b/mysql-test/t/show_check.test      2011-04-09 18:49:05.000000000 +0400
 
736
--- a/mysql-test/t/show_check.test
 
737
+++ b/mysql-test/t/show_check.test
754
738
@@ -1376,10 +1376,10 @@
755
739
 let $wait_timeout= 10;
756
740
 let $wait_condition= SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE INFO LIKE '%GET_LOCK%' AND ID != CONNECTION_ID();
764
748
 SHOW PROCESSLIST;
765
749
 SELECT RELEASE_LOCK('t');
766
750
 --connection con1
767
 
diff -ruN a/mysql-test/t/sp-threads.test b/mysql-test/t/sp-threads.test
768
 
--- a/mysql-test/t/sp-threads.test      2011-04-09 18:48:03.000000000 +0400
769
 
+++ b/mysql-test/t/sp-threads.test      2011-04-09 18:49:05.000000000 +0400
 
751
--- a/mysql-test/t/sp-threads.test
 
752
+++ b/mysql-test/t/sp-threads.test
770
753
@@ -81,7 +81,7 @@
771
754
 connection con2root;
772
755
 --sleep 2
776
759
 show processlist;
777
760
 unlock tables;
778
761
 connection con1root;
779
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result
780
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
781
 
+++ b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result   2011-04-09 18:49:05.000000000 +0400
 
762
--- /dev/null
 
763
+++ b/mysql-test/suite/sys_vars/r/log_slow_sp_statements_basic.result
782
764
@@ -0,0 +1,3 @@
783
765
+SELECT @@global.log_slow_sp_statements;
784
766
+@@global.log_slow_sp_statements
785
767
+1
786
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test
787
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
788
 
+++ b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test     2011-04-09 18:49:05.000000000 +0400
 
768
--- /dev/null
 
769
+++ b/mysql-test/suite/sys_vars/t/log_slow_sp_statements_basic.test
789
770
@@ -0,0 +1 @@
790
771
+SELECT @@global.log_slow_sp_statements;
791
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result
792
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
793
 
+++ b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result      2011-04-09 18:49:05.000000000 +0400
 
772
--- /dev/null
 
773
+++ b/mysql-test/suite/sys_vars/r/fast_index_creation_basic.result
794
774
@@ -0,0 +1,3 @@
795
775
+SELECT @@global.fast_index_creation;
796
776
+@@global.fast_index_creation
797
777
+1
798
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result
799
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
800
 
+++ b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result  2011-04-09 18:49:05.000000000 +0400
 
778
--- /dev/null
 
779
+++ b/mysql-test/suite/sys_vars/r/have_response_time_distribution_basic.result
801
780
@@ -0,0 +1,3 @@
802
781
+SELECT @@global.have_response_time_distribution;
803
782
+@@global.have_response_time_distribution
804
783
+YES
805
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result
806
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
807
 
+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result  2011-04-09 18:49:05.000000000 +0400
 
784
--- /dev/null
 
785
+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_flushing_method_basic.result
808
786
@@ -0,0 +1,3 @@
809
787
+SELECT @@global.innodb_adaptive_flushing_method;
810
788
+@@global.innodb_adaptive_flushing_method
811
789
+estimate
812
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result
813
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
814
 
+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result    2011-04-09 18:49:05.000000000 +0400
 
790
--- /dev/null
 
791
+++ b/mysql-test/suite/sys_vars/r/innodb_adaptive_hash_index_partitions_basic.result
815
792
@@ -0,0 +1,3 @@
816
793
+SELECT @@global.innodb_adaptive_hash_index_partitions;
817
794
+@@global.innodb_adaptive_hash_index_partitions
818
795
+1
819
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result
820
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
821
 
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result    2011-04-09 18:49:05.000000000 +0400
 
796
--- /dev/null
 
797
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_restore_at_startup_basic.result
822
798
@@ -0,0 +1,3 @@
823
799
+SELECT @@global.innodb_buffer_pool_restore_at_startup;
824
800
+@@global.innodb_buffer_pool_restore_at_startup
825
801
+0
826
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result
827
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
828
 
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result  2011-04-09 18:49:05.000000000 +0400
 
802
--- /dev/null
 
803
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_checksum_basic.result
829
804
@@ -0,0 +1,3 @@
830
805
+SELECT @@global.innodb_buffer_pool_shm_checksum;
831
806
+@@global.innodb_buffer_pool_shm_checksum
832
807
+1
833
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result
834
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
835
 
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result       2011-04-09 18:49:05.000000000 +0400
 
808
--- /dev/null
 
809
+++ b/mysql-test/suite/sys_vars/r/innodb_buffer_pool_shm_key_basic.result
836
810
@@ -0,0 +1,3 @@
837
811
+SELECT @@global.innodb_buffer_pool_shm_key;
838
812
+@@global.innodb_buffer_pool_shm_key
839
813
+0
840
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result
841
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
842
 
+++ b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result     2011-04-09 18:49:05.000000000 +0400
 
814
--- /dev/null
 
815
+++ b/mysql-test/suite/sys_vars/r/innodb_checkpoint_age_target_basic.result
843
816
@@ -0,0 +1,3 @@
844
817
+SELECT @@global.innodb_checkpoint_age_target;
845
818
+@@global.innodb_checkpoint_age_target
846
819
+0
847
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result
848
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
849
 
+++ b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result      2011-04-09 18:49:05.000000000 +0400
 
820
--- /dev/null
 
821
+++ b/mysql-test/suite/sys_vars/r/innodb_corrupt_table_action_basic.result
850
822
@@ -0,0 +1,3 @@
851
823
+SELECT @@global.innodb_corrupt_table_action;
852
824
+@@global.innodb_corrupt_table_action
853
825
+assert
854
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result
855
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
856
 
+++ b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result   2011-04-09 18:49:05.000000000 +0400
 
826
--- /dev/null
 
827
+++ b/mysql-test/suite/sys_vars/r/innodb_dict_size_limit_basic.result
857
828
@@ -0,0 +1,3 @@
858
829
+SELECT @@global.innodb_dict_size_limit;
859
830
+@@global.innodb_dict_size_limit
860
831
+0
861
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result
862
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
863
 
+++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result  2011-04-09 18:49:05.000000000 +0400
 
832
--- /dev/null
 
833
+++ b/mysql-test/suite/sys_vars/r/innodb_doublewrite_file_basic.result
864
834
@@ -0,0 +1,3 @@
865
835
+SELECT @@global.innodb_doublewrite_file;
866
836
+@@global.innodb_doublewrite_file
867
837
+NULL
868
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result
869
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
870
 
+++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result     2011-04-09 18:49:05.000000000 +0400
 
838
--- /dev/null
 
839
+++ b/mysql-test/suite/sys_vars/r/innodb_fast_checksum_basic.result
871
840
@@ -0,0 +1,3 @@
872
841
+SELECT @@global.innodb_fast_checksum;
873
842
+@@global.innodb_fast_checksum
874
843
+0
875
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result
876
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
877
 
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result      2011-04-09 18:49:05.000000000 +0400
 
844
--- /dev/null
 
845
+++ b/mysql-test/suite/sys_vars/r/innodb_flush_neighbor_pages_basic.result
878
846
@@ -0,0 +1,3 @@
879
847
+SELECT @@global.innodb_flush_neighbor_pages;
880
848
+@@global.innodb_flush_neighbor_pages
881
849
+1
882
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result
883
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
884
 
+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result   2011-04-09 18:49:05.000000000 +0400
 
850
--- /dev/null
 
851
+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_accel_rate_basic.result
885
852
@@ -0,0 +1,3 @@
886
853
+SELECT @@global.innodb_ibuf_accel_rate;
887
854
+@@global.innodb_ibuf_accel_rate
888
855
+100
889
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result
890
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
891
 
+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result      2011-04-09 18:49:05.000000000 +0400
 
856
--- /dev/null
 
857
+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_active_contract_basic.result
892
858
@@ -0,0 +1,3 @@
893
859
+SELECT @@global.innodb_ibuf_active_contract;
894
860
+@@global.innodb_ibuf_active_contract
895
861
+1
896
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result
897
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
898
 
+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result     2011-04-09 18:49:05.000000000 +0400
 
862
--- /dev/null
 
863
+++ b/mysql-test/suite/sys_vars/r/innodb_ibuf_max_size_basic.result
899
864
@@ -0,0 +1,3 @@
900
865
+SELECT @@global.innodb_ibuf_max_size;
901
866
+@@global.innodb_ibuf_max_size
902
867
+16760832
903
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result
904
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
905
 
+++ b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result      2011-04-09 18:49:05.000000000 +0400
 
868
--- /dev/null
 
869
+++ b/mysql-test/suite/sys_vars/r/innodb_import_table_from_xtrabackup_basic.result
906
870
@@ -0,0 +1,3 @@
907
871
+SELECT @@global.innodb_import_table_from_xtrabackup;
908
872
+@@global.innodb_import_table_from_xtrabackup
909
873
+0
910
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result
911
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
912
 
+++ b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result   2011-04-09 18:49:05.000000000 +0400
 
874
--- /dev/null
 
875
+++ b/mysql-test/suite/sys_vars/r/innodb_lazy_drop_table_basic.result
913
876
@@ -0,0 +1,3 @@
914
877
+SELECT @@global.innodb_lazy_drop_table;
915
878
+@@global.innodb_lazy_drop_table
916
879
+0
917
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result
918
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
919
 
+++ b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result    2011-04-09 18:49:05.000000000 +0400
 
880
--- /dev/null
 
881
+++ b/mysql-test/suite/sys_vars/r/innodb_log_block_size_basic.result
920
882
@@ -0,0 +1,3 @@
921
883
+SELECT @@global.innodb_log_block_size;
922
884
+@@global.innodb_log_block_size
923
885
+512
924
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result
925
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
926
 
+++ b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result 2011-04-09 18:49:05.000000000 +0400
 
886
--- /dev/null
 
887
+++ b/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result
927
888
@@ -0,0 +1,3 @@
928
889
+SELECT @@global.innodb_page_size;
929
890
+@@global.innodb_page_size
930
891
+16384
931
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result
932
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
933
 
+++ b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result        2011-04-09 18:49:05.000000000 +0400
 
892
--- /dev/null
 
893
+++ b/mysql-test/suite/sys_vars/r/innodb_read_ahead_basic.result
934
894
@@ -0,0 +1,3 @@
935
895
+SELECT @@global.innodb_read_ahead;
936
896
+@@global.innodb_read_ahead
937
897
+linear
938
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result
939
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
940
 
+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result    2011-04-09 18:49:05.000000000 +0400
 
898
--- /dev/null
 
899
+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_stats_basic.result
941
900
@@ -0,0 +1,3 @@
942
901
+SELECT @@global.innodb_recovery_stats;
943
902
+@@global.innodb_recovery_stats
944
903
+0
945
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result
946
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
947
 
+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result 2011-04-09 18:49:05.000000000 +0400
 
904
--- /dev/null
 
905
+++ b/mysql-test/suite/sys_vars/r/innodb_recovery_update_relay_log_basic.result
948
906
@@ -0,0 +1,3 @@
949
907
+SELECT @@global.innodb_recovery_update_relay_log;
950
908
+@@global.innodb_recovery_update_relay_log
951
909
+0
952
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result
953
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
954
 
+++ b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result   2011-04-09 18:49:05.000000000 +0400
 
910
--- /dev/null
 
911
+++ b/mysql-test/suite/sys_vars/r/innodb_show_locks_held_basic.result
955
912
@@ -0,0 +1,3 @@
956
913
+SELECT @@global.innodb_show_locks_held;
957
914
+@@global.innodb_show_locks_held
958
915
+10
959
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result
960
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
961
 
+++ b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result        2011-04-09 18:49:05.000000000 +0400
 
916
--- /dev/null
 
917
+++ b/mysql-test/suite/sys_vars/r/innodb_show_verbose_locks_basic.result
962
918
@@ -0,0 +1,3 @@
963
919
+SELECT @@global.innodb_show_verbose_locks;
964
920
+@@global.innodb_show_verbose_locks
965
921
+0
966
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result
967
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
968
 
+++ b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result 2011-04-09 18:49:05.000000000 +0400
 
922
--- /dev/null
 
923
+++ b/mysql-test/suite/sys_vars/r/innodb_stats_auto_update_basic.result
969
924
@@ -0,0 +1,3 @@
970
925
+SELECT @@global.innodb_stats_auto_update;
971
926
+@@global.innodb_stats_auto_update
972
927
+1
973
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result
974
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
975
 
+++ b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result    2011-04-09 18:49:05.000000000 +0400
 
928
--- /dev/null
 
929
+++ b/mysql-test/suite/sys_vars/r/innodb_stats_update_need_lock_basic.result
976
930
@@ -0,0 +1,3 @@
977
931
+SELECT @@global.innodb_stats_update_need_lock;
978
932
+@@global.innodb_stats_update_need_lock
979
933
+1
980
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result
981
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
982
 
+++ b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result    2011-04-09 18:49:05.000000000 +0400
 
934
--- /dev/null
 
935
+++ b/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_timer_based_basic.result
983
936
@@ -0,0 +1,3 @@
984
937
+SELECT @@global.innodb_thread_concurrency_timer_based;
985
938
+@@global.innodb_thread_concurrency_timer_based
986
939
+0
987
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result
988
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
989
 
+++ b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result        2011-04-09 18:49:05.000000000 +0400
 
940
--- /dev/null
 
941
+++ b/mysql-test/suite/sys_vars/r/innodb_use_global_flush_log_at_trx_commit_basic.result
990
942
@@ -0,0 +1,3 @@
991
943
+SELECT @@global.innodb_use_global_flush_log_at_trx_commit;
992
944
+@@global.innodb_use_global_flush_log_at_trx_commit
993
945
+1
994
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result
995
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
996
 
+++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result       2011-04-09 18:49:05.000000000 +0400
 
946
--- /dev/null
 
947
+++ b/mysql-test/suite/sys_vars/r/innodb_use_sys_stats_table_basic.result
997
948
@@ -0,0 +1,3 @@
998
949
+SELECT @@global.innodb_use_sys_stats_table;
999
950
+@@global.innodb_use_sys_stats_table
1000
951
+0
1001
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
1002
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1003
 
+++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result  2011-04-09 18:49:05.000000000 +0400
 
952
--- /dev/null
 
953
+++ b/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
1004
954
@@ -0,0 +1,3 @@
1005
955
+SELECT @@global.log_slow_filter;
1006
956
+@@global.log_slow_filter
1007
957
+
1008
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
1009
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1010
 
+++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result      2011-04-09 18:49:05.000000000 +0400
 
958
--- /dev/null
 
959
+++ b/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
1011
960
@@ -0,0 +1,3 @@
1012
961
+SELECT @@global.log_slow_rate_limit;
1013
962
+@@global.log_slow_rate_limit
1014
963
+1
1015
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result
1016
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1017
 
+++ b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result        2011-04-09 18:49:05.000000000 +0400
 
964
--- /dev/null
 
965
+++ b/mysql-test/suite/sys_vars/r/log_slow_slave_statements_basic.result
1018
966
@@ -0,0 +1,3 @@
1019
967
+SELECT @@global.log_slow_slave_statements;
1020
968
+@@global.log_slow_slave_statements
1021
969
+0
1022
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
1023
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1024
 
+++ b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result       2011-04-09 18:49:05.000000000 +0400
 
970
--- /dev/null
 
971
+++ b/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
1025
972
@@ -0,0 +1,3 @@
1026
973
+SELECT @@global.log_slow_verbosity;
1027
974
+@@global.log_slow_verbosity
1028
975
+
1029
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result
1030
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1031
 
+++ b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result    2011-04-09 18:49:05.000000000 +0400
 
976
--- /dev/null
 
977
+++ b/mysql-test/suite/sys_vars/r/log_warnings_suppress_basic.result
1032
978
@@ -0,0 +1,3 @@
1033
979
+SELECT @@global.log_warnings_suppress;
1034
980
+@@global.log_warnings_suppress
1035
981
+
1036
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result
1037
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1038
 
+++ b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result    2011-04-09 18:49:05.000000000 +0400
 
982
--- /dev/null
 
983
+++ b/mysql-test/suite/sys_vars/r/optimizer_fix_basic.result
1039
984
@@ -0,0 +1,3 @@
1040
985
+SELECT @@global.optimizer_fix;
1041
986
+@@global.optimizer_fix
1042
987
+1
1043
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result
1044
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1045
 
+++ b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result       2011-04-09 18:49:05.000000000 +0400
 
988
--- /dev/null
 
989
+++ b/mysql-test/suite/sys_vars/r/query_cache_strip_comments_basic.result
1046
990
@@ -0,0 +1,3 @@
1047
991
+SELECT @@global.query_cache_strip_comments;
1048
992
+@@global.query_cache_strip_comments
1049
993
+0
1050
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result
1051
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1052
 
+++ b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result   2011-04-09 18:49:05.000000000 +0400
 
994
--- /dev/null
 
995
+++ b/mysql-test/suite/sys_vars/r/query_response_time_range_base_basic.result
1053
996
@@ -0,0 +1,3 @@
1054
997
+SELECT @@global.query_response_time_range_base;
1055
998
+@@global.query_response_time_range_base
1056
999
+10
1057
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result
1058
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1059
 
+++ b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result        2011-04-09 18:49:05.000000000 +0400
 
1000
--- /dev/null
 
1001
+++ b/mysql-test/suite/sys_vars/r/query_response_time_stats_basic.result
1060
1002
@@ -0,0 +1,3 @@
1061
1003
+SELECT @@global.query_response_time_stats;
1062
1004
+@@global.query_response_time_stats
1063
1005
+0
1064
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result
1065
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1066
 
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result  2011-04-09 18:49:05.000000000 +0400
 
1006
--- /dev/null
 
1007
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_always_basic.result
1067
1008
@@ -0,0 +1,3 @@
1068
1009
+SELECT @@global.slow_query_log_timestamp_always;
1069
1010
+@@global.slow_query_log_timestamp_always
1070
1011
+0
1071
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result
1072
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1073
 
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result       2011-04-09 18:49:05.000000000 +0400
 
1012
--- /dev/null
 
1013
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_timestamp_precision_basic.result
1074
1014
@@ -0,0 +1,3 @@
1075
1015
+SELECT @@global.slow_query_log_timestamp_precision;
1076
1016
+@@global.slow_query_log_timestamp_precision
1077
1017
+second
1078
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result
1079
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1080
 
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result        2011-04-09 18:49:05.000000000 +0400
 
1018
--- /dev/null
 
1019
+++ b/mysql-test/suite/sys_vars/r/slow_query_log_use_global_control_basic.result
1081
1020
@@ -0,0 +1,3 @@
1082
1021
+SELECT @@global.slow_query_log_use_global_control;
1083
1022
+@@global.slow_query_log_use_global_control
1084
1023
+
1085
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result
1086
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1087
 
+++ b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result        2011-04-09 18:49:05.000000000 +0400
 
1024
--- /dev/null
 
1025
+++ b/mysql-test/suite/sys_vars/r/thread_statistics_basic.result
1088
1026
@@ -0,0 +1,3 @@
1089
1027
+SELECT @@global.thread_statistics;
1090
1028
+@@global.thread_statistics
1091
1029
+0
1092
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/r/userstat_basic.result
1093
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1094
 
+++ b/mysql-test/suite/sys_vars/r/userstat_basic.result 2011-04-09 18:49:05.000000000 +0400
 
1030
--- /dev/null
 
1031
+++ b/mysql-test/suite/sys_vars/r/userstat_basic.result
1095
1032
@@ -0,0 +1,3 @@
1096
1033
+SELECT @@global.userstat;
1097
1034
+@@global.userstat
1098
1035
+0
1099
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test
1100
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1101
 
+++ b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test        2011-04-09 18:49:05.000000000 +0400
 
1036
--- /dev/null
 
1037
+++ b/mysql-test/suite/sys_vars/t/fast_index_creation_basic.test
1102
1038
@@ -0,0 +1 @@
1103
1039
+SELECT @@global.fast_index_creation;
1104
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/have_response_time_distribution_basic.test
1105
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1106
 
+++ b/mysql-test/suite/sys_vars/t/have_response_time_distribution_basic.test    2011-04-09 18:49:05.000000000 +0400
 
1040
--- /dev/null
 
1041
+++ b/mysql-test/suite/sys_vars/t/have_response_time_distribution_basic.test
1107
1042
@@ -0,0 +1 @@
1108
1043
+SELECT @@global.have_response_time_distribution;
1109
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test
1110
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1111
 
+++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test    2011-04-09 18:49:05.000000000 +0400
 
1044
--- /dev/null
 
1045
+++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_flushing_method_basic.test
1112
1046
@@ -0,0 +1 @@
1113
1047
+SELECT @@global.innodb_adaptive_flushing_method;
1114
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test
1115
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1116
 
+++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test      2011-04-09 18:49:05.000000000 +0400
 
1048
--- /dev/null
 
1049
+++ b/mysql-test/suite/sys_vars/t/innodb_adaptive_hash_index_partitions_basic.test
1117
1050
@@ -0,0 +1 @@
1118
1051
+SELECT @@global.innodb_adaptive_hash_index_partitions;
1119
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test
1120
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1121
 
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test      2011-04-09 18:49:05.000000000 +0400
 
1052
--- /dev/null
 
1053
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_restore_at_startup_basic.test
1122
1054
@@ -0,0 +1 @@
1123
1055
+SELECT @@global.innodb_buffer_pool_restore_at_startup;
1124
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test
1125
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1126
 
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test    2011-04-09 18:49:05.000000000 +0400
 
1056
--- /dev/null
 
1057
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_checksum_basic.test
1127
1058
@@ -0,0 +1 @@
1128
1059
+SELECT @@global.innodb_buffer_pool_shm_checksum;
1129
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test
1130
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1131
 
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test 2011-04-09 18:49:05.000000000 +0400
 
1060
--- /dev/null
 
1061
+++ b/mysql-test/suite/sys_vars/t/innodb_buffer_pool_shm_key_basic.test
1132
1062
@@ -0,0 +1 @@
1133
1063
+SELECT @@global.innodb_buffer_pool_shm_key;
1134
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test
1135
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1136
 
+++ b/mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test       2011-04-09 18:49:05.000000000 +0400
 
1064
--- /dev/null
 
1065
+++ b/mysql-test/suite/sys_vars/t/innodb_checkpoint_age_target_basic.test
1137
1066
@@ -0,0 +1 @@
1138
1067
+SELECT @@global.innodb_checkpoint_age_target;
1139
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test
1140
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1141
 
+++ b/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test        2011-04-09 18:49:05.000000000 +0400
 
1068
--- /dev/null
 
1069
+++ b/mysql-test/suite/sys_vars/t/innodb_corrupt_table_action_basic.test
1142
1070
@@ -0,0 +1 @@
1143
1071
+SELECT @@global.innodb_corrupt_table_action;
1144
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test
1145
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1146
 
+++ b/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test     2011-04-09 18:49:05.000000000 +0400
 
1072
--- /dev/null
 
1073
+++ b/mysql-test/suite/sys_vars/t/innodb_dict_size_limit_basic.test
1147
1074
@@ -0,0 +1 @@
1148
1075
+SELECT @@global.innodb_dict_size_limit;
1149
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test
1150
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1151
 
+++ b/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test    2011-04-09 18:49:05.000000000 +0400
 
1076
--- /dev/null
 
1077
+++ b/mysql-test/suite/sys_vars/t/innodb_doublewrite_file_basic.test
1152
1078
@@ -0,0 +1 @@
1153
1079
+SELECT @@global.innodb_doublewrite_file;
1154
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test
1155
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1156
 
+++ b/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test       2011-04-09 18:49:05.000000000 +0400
 
1080
--- /dev/null
 
1081
+++ b/mysql-test/suite/sys_vars/t/innodb_fast_checksum_basic.test
1157
1082
@@ -0,0 +1 @@
1158
1083
+SELECT @@global.innodb_fast_checksum;
1159
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test
1160
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1161
 
+++ b/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test        2011-04-09 18:49:05.000000000 +0400
 
1084
--- /dev/null
 
1085
+++ b/mysql-test/suite/sys_vars/t/innodb_flush_neighbor_pages_basic.test
1162
1086
@@ -0,0 +1 @@
1163
1087
+SELECT @@global.innodb_flush_neighbor_pages;
1164
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test
1165
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1166
 
+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test     2011-04-09 18:49:05.000000000 +0400
 
1088
--- /dev/null
 
1089
+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_accel_rate_basic.test
1167
1090
@@ -0,0 +1 @@
1168
1091
+SELECT @@global.innodb_ibuf_accel_rate;
1169
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test
1170
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1171
 
+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test        2011-04-09 18:49:05.000000000 +0400
 
1092
--- /dev/null
 
1093
+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_active_contract_basic.test
1172
1094
@@ -0,0 +1 @@
1173
1095
+SELECT @@global.innodb_ibuf_active_contract;
1174
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test
1175
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1176
 
+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test       2011-04-09 18:49:05.000000000 +0400
 
1096
--- /dev/null
 
1097
+++ b/mysql-test/suite/sys_vars/t/innodb_ibuf_max_size_basic.test
1177
1098
@@ -0,0 +1 @@
1178
1099
+SELECT @@global.innodb_ibuf_max_size;
1179
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test
1180
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1181
 
+++ b/mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test        2011-04-09 18:49:05.000000000 +0400
 
1100
--- /dev/null
 
1101
+++ b/mysql-test/suite/sys_vars/t/innodb_import_table_from_xtrabackup_basic.test
1182
1102
@@ -0,0 +1 @@
1183
1103
+SELECT @@global.innodb_import_table_from_xtrabackup;
1184
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test
1185
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1186
 
+++ b/mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test     2011-04-09 18:49:05.000000000 +0400
 
1104
--- /dev/null
 
1105
+++ b/mysql-test/suite/sys_vars/t/innodb_lazy_drop_table_basic.test
1187
1106
@@ -0,0 +1 @@
1188
1107
+SELECT @@global.innodb_lazy_drop_table;
1189
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test
1190
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1191
 
+++ b/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test      2011-04-09 18:49:05.000000000 +0400
 
1108
--- /dev/null
 
1109
+++ b/mysql-test/suite/sys_vars/t/innodb_log_block_size_basic.test
1192
1110
@@ -0,0 +1 @@
1193
1111
+SELECT @@global.innodb_log_block_size;
1194
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test
1195
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1196
 
+++ b/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test   2011-04-09 18:49:05.000000000 +0400
 
1112
--- /dev/null
 
1113
+++ b/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test
1197
1114
@@ -0,0 +1 @@
1198
1115
+SELECT @@global.innodb_page_size;
1199
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test
1200
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1201
 
+++ b/mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test  2011-04-09 18:49:05.000000000 +0400
 
1116
--- /dev/null
 
1117
+++ b/mysql-test/suite/sys_vars/t/innodb_read_ahead_basic.test
1202
1118
@@ -0,0 +1 @@
1203
1119
+SELECT @@global.innodb_read_ahead;
1204
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test
1205
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1206
 
+++ b/mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test      2011-04-09 18:49:05.000000000 +0400
 
1120
--- /dev/null
 
1121
+++ b/mysql-test/suite/sys_vars/t/innodb_recovery_stats_basic.test
1207
1122
@@ -0,0 +1 @@
1208
1123
+SELECT @@global.innodb_recovery_stats;
1209
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test
1210
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1211
 
+++ b/mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test   2011-04-09 18:49:05.000000000 +0400
 
1124
--- /dev/null
 
1125
+++ b/mysql-test/suite/sys_vars/t/innodb_recovery_update_relay_log_basic.test
1212
1126
@@ -0,0 +1 @@
1213
1127
+SELECT @@global.innodb_recovery_update_relay_log;
1214
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test
1215
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1216
 
+++ b/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test     2011-04-09 18:49:05.000000000 +0400
 
1128
--- /dev/null
 
1129
+++ b/mysql-test/suite/sys_vars/t/innodb_show_locks_held_basic.test
1217
1130
@@ -0,0 +1 @@
1218
1131
+SELECT @@global.innodb_show_locks_held;
1219
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test
1220
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1221
 
+++ b/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test  2011-04-09 18:49:05.000000000 +0400
 
1132
--- /dev/null
 
1133
+++ b/mysql-test/suite/sys_vars/t/innodb_show_verbose_locks_basic.test
1222
1134
@@ -0,0 +1 @@
1223
1135
+SELECT @@global.innodb_show_verbose_locks;
1224
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test
1225
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1226
 
+++ b/mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test   2011-04-09 18:49:05.000000000 +0400
 
1136
--- /dev/null
 
1137
+++ b/mysql-test/suite/sys_vars/t/innodb_stats_auto_update_basic.test
1227
1138
@@ -0,0 +1 @@
1228
1139
+SELECT @@global.innodb_stats_auto_update;
1229
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test
1230
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1231
 
+++ b/mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test      2011-04-09 18:49:05.000000000 +0400
 
1140
--- /dev/null
 
1141
+++ b/mysql-test/suite/sys_vars/t/innodb_stats_update_need_lock_basic.test
1232
1142
@@ -0,0 +1 @@
1233
1143
+SELECT @@global.innodb_stats_update_need_lock;
1234
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test
1235
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1236
 
+++ b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test      2011-04-09 18:49:05.000000000 +0400
 
1144
--- /dev/null
 
1145
+++ b/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_timer_based_basic.test
1237
1146
@@ -0,0 +1 @@
1238
1147
+SELECT @@global.innodb_thread_concurrency_timer_based;
1239
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test
1240
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1241
 
+++ b/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test  2011-04-09 18:49:05.000000000 +0400
 
1148
--- /dev/null
 
1149
+++ b/mysql-test/suite/sys_vars/t/innodb_use_global_flush_log_at_trx_commit_basic.test
1242
1150
@@ -0,0 +1 @@
1243
1151
+SELECT @@global.innodb_use_global_flush_log_at_trx_commit;
1244
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test
1245
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1246
 
+++ b/mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test 2011-04-09 18:49:05.000000000 +0400
 
1152
--- /dev/null
 
1153
+++ b/mysql-test/suite/sys_vars/t/innodb_use_sys_stats_table_basic.test
1247
1154
@@ -0,0 +1 @@
1248
1155
+SELECT @@global.innodb_use_sys_stats_table;
1249
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test
1250
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1251
 
+++ b/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test    2011-04-09 18:49:05.000000000 +0400
 
1156
--- /dev/null
 
1157
+++ b/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test
1252
1158
@@ -0,0 +1 @@
1253
1159
+SELECT @@global.log_slow_filter;
1254
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test
1255
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1256
 
+++ b/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test        2011-04-09 18:49:05.000000000 +0400
 
1160
--- /dev/null
 
1161
+++ b/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test
1257
1162
@@ -0,0 +1 @@
1258
1163
+SELECT @@global.log_slow_rate_limit;
1259
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test
1260
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1261
 
+++ b/mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test  2011-04-09 18:49:05.000000000 +0400
 
1164
--- /dev/null
 
1165
+++ b/mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test
1262
1166
@@ -0,0 +1 @@
1263
1167
+SELECT @@global.log_slow_slave_statements;
1264
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test
1265
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1266
 
+++ b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test 2011-04-09 18:49:05.000000000 +0400
 
1168
--- /dev/null
 
1169
+++ b/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test
1267
1170
@@ -0,0 +1 @@
1268
1171
+SELECT @@global.log_slow_verbosity;
1269
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/log_warnings_suppress_basic.test
1270
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1271
 
+++ b/mysql-test/suite/sys_vars/t/log_warnings_suppress_basic.test      2011-04-09 18:49:05.000000000 +0400
 
1172
--- /dev/null
 
1173
+++ b/mysql-test/suite/sys_vars/t/log_warnings_suppress_basic.test
1272
1174
@@ -0,0 +1 @@
1273
1175
+SELECT @@global.log_warnings_suppress;
1274
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/optimizer_fix_basic.test
1275
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1276
 
+++ b/mysql-test/suite/sys_vars/t/optimizer_fix_basic.test      2011-04-09 18:49:05.000000000 +0400
 
1176
--- /dev/null
 
1177
+++ b/mysql-test/suite/sys_vars/t/optimizer_fix_basic.test
1277
1178
@@ -0,0 +1 @@
1278
1179
+SELECT @@global.optimizer_fix;
1279
 
diff -ruN a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
1280
 
--- a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test 2011-04-09 18:48:03.000000000 +0400
1281
 
+++ b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test 2011-04-09 18:49:05.000000000 +0400
 
1180
--- a/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
 
1181
+++ b/mysql-test/suite/sys_vars/t/plugin_dir_basic.test
1282
1182
@@ -6,17 +6,17 @@
1283
1183
 # on windows it's <basedir>/lib/plugin
1284
1184
 # on unix it's <basedir>/lib/mysql/plugin
1302
1202
 select * from information_schema.session_variables where variable_name='plugin_dir';
1303
1203
 
1304
1204
 #
1305
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test
1306
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1307
 
+++ b/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test 2011-04-09 18:49:05.000000000 +0400
 
1205
--- /dev/null
 
1206
+++ b/mysql-test/suite/sys_vars/t/query_cache_strip_comments_basic.test
1308
1207
@@ -0,0 +1 @@
1309
1208
+SELECT @@global.query_cache_strip_comments;
1310
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/query_response_time_range_base_basic.test
1311
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1312
 
+++ b/mysql-test/suite/sys_vars/t/query_response_time_range_base_basic.test     2011-04-09 18:49:05.000000000 +0400
 
1209
--- /dev/null
 
1210
+++ b/mysql-test/suite/sys_vars/t/query_response_time_range_base_basic.test
1313
1211
@@ -0,0 +1 @@
1314
1212
+SELECT @@global.query_response_time_range_base;
1315
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/query_response_time_stats_basic.test
1316
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1317
 
+++ b/mysql-test/suite/sys_vars/t/query_response_time_stats_basic.test  2011-04-09 18:49:05.000000000 +0400
 
1213
--- /dev/null
 
1214
+++ b/mysql-test/suite/sys_vars/t/query_response_time_stats_basic.test
1318
1215
@@ -0,0 +1 @@
1319
1216
+SELECT @@global.query_response_time_stats;
1320
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_always_basic.test
1321
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1322
 
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_always_basic.test    2011-04-09 18:49:05.000000000 +0400
 
1217
--- /dev/null
 
1218
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_always_basic.test
1323
1219
@@ -0,0 +1 @@
1324
1220
+SELECT @@global.slow_query_log_timestamp_always;
1325
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_precision_basic.test
1326
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1327
 
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_precision_basic.test 2011-04-09 18:49:05.000000000 +0400
 
1221
--- /dev/null
 
1222
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_timestamp_precision_basic.test
1328
1223
@@ -0,0 +1 @@
1329
1224
+SELECT @@global.slow_query_log_timestamp_precision;
1330
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/slow_query_log_use_global_control_basic.test
1331
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1332
 
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_use_global_control_basic.test  2011-04-09 18:49:05.000000000 +0400
 
1225
--- /dev/null
 
1226
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_use_global_control_basic.test
1333
1227
@@ -0,0 +1 @@
1334
1228
+SELECT @@global.slow_query_log_use_global_control;
1335
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/thread_statistics_basic.test
1336
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1337
 
+++ b/mysql-test/suite/sys_vars/t/thread_statistics_basic.test  2011-04-09 18:49:05.000000000 +0400
 
1229
--- /dev/null
 
1230
+++ b/mysql-test/suite/sys_vars/t/thread_statistics_basic.test
1338
1231
@@ -0,0 +1 @@
1339
1232
+SELECT @@global.thread_statistics;
1340
 
diff -ruN /dev/null b/mysql-test/suite/sys_vars/t/userstat_basic.test
1341
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1342
 
+++ b/mysql-test/suite/sys_vars/t/userstat_basic.test   2011-04-09 18:49:05.000000000 +0400
 
1233
--- /dev/null
 
1234
+++ b/mysql-test/suite/sys_vars/t/userstat_basic.test
1343
1235
@@ -0,0 +1 @@
1344
1236
+SELECT @@global.userstat;
1345
 
diff -ruN a/mysql-test/suite/sys_vars/t/all_vars.test b/mysql-test/suite/sys_vars/t/all_vars.test
1346
 
--- a/mysql-test/suite/sys_vars/t/all_vars.test 2011-06-21 19:42:40.000000000 +0300
1347
 
+++ b/mysql-test/suite/sys_vars/t/all_vars.test 2011-08-01 06:54:45.649243091 +0300
 
1237
--- a/mysql-test/suite/sys_vars/t/all_vars.test
 
1238
+++ b/mysql-test/suite/sys_vars/t/all_vars.test
1348
1239
@@ -59,8 +59,8 @@
1349
1240
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
1350
1241
 eval load data infile "$MYSQLTEST_VARDIR/tmp/sys_vars.all_vars.txt" into table t1;
1356
1247
 
1357
1248
 # This is only present in debug builds.
1358
1249
 delete from t2 where variable_name='innodb_change_buffering_debug';
1359
 
diff -ruN a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
1360
 
--- a/mysql-test/suite/sys_vars/r/all_vars.result       2011-06-21 19:42:40.000000000 +0300
1361
 
+++ b/mysql-test/suite/sys_vars/r/all_vars.result       2011-08-01 06:57:24.338627397 +0300
 
1250
--- a/mysql-test/suite/sys_vars/r/all_vars.result
 
1251
+++ b/mysql-test/suite/sys_vars/r/all_vars.result
1362
1252
@@ -1,8 +1,8 @@
1363
1253
 create table t1 (test_name text);
1364
1254
 create table t2 (variable_name text);
1370
1260
 delete from t2 where variable_name='innodb_change_buffering_debug';
1371
1261
 update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
1372
1262
 select variable_name as `There should be *no* long test name listed below:` from t2
1373
 
@@ -11,13 +11,17 @@
 
1263
@@ -11,13 +11,13 @@
1374
1264
 select variable_name as `There should be *no* variables listed below:` from t2
1375
1265
 left join t1 on variable_name=test_name where test_name is null;
1376
1266
 There should be *no* variables listed below:
1377
1267
-INNODB_ROLLBACK_SEGMENTS
1378
1268
-INNODB_STATS_METHOD
1379
 
+INNODB_FAKE_CHANGES
1380
1269
 INNODB_FILE_FORMAT_MAX
1381
 
+INNODB_KILL_IDLE_TRANSACTION
1382
1270
 INNODB_LARGE_PREFIX
1383
1271
 INNODB_ROLLBACK_SEGMENTS
1384
1272
 INNODB_STATS_METHOD
1385
 
+INNODB_FAKE_CHANGES
1386
1273
 INNODB_FILE_FORMAT_MAX
1387
 
+INNODB_KILL_IDLE_TRANSACTION
1388
1274
 INNODB_LARGE_PREFIX
1389
1275
+INNODB_ROLLBACK_SEGMENTS
1390
1276
+INNODB_STATS_METHOD