← Back to branch summary

~jaypipes/drizzle/new-test-runner

« back to all changes in this revision

Viewing changes to storage/innobase/mysql-test/patches/innodb_file_per_table.diff

  • Committer: Jay Pipes
  • Date: 2008-12-11 17:52:34 UTC
  • mfrom: (482.16.152 testable)
  • Revision ID: jpipes@serialcoder-20081211175234-uqsfvmgxejvmellq
merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/mysql-test/patches/innodb_file_per_table.diff
 
1
diff mysql-test/t/innodb_file_per_table_basic.test.orig mysql-test/t/innodb_file_per_table_basic.test
 
2
--- mysql-test/t/innodb_file_per_table_basic.test.orig  2008-10-07 11:32:30.000000000 +0300
 
3
+++ mysql-test/t/innodb_file_per_table_basic.test       2008-10-07 11:52:14.000000000 +0300
 
4
@@ -37,10 +37,6 @@
 
5
 #   Check if Value can set                                         #
 
6
 ####################################################################
 
7
 
 
8
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
 
9
-SET @@GLOBAL.innodb_file_per_table=1;
 
10
---echo Expected error 'Read only variable'
 
11
-
 
12
 SELECT COUNT(@@GLOBAL.innodb_file_per_table);
 
13
 --echo 1 Expected
 
14
 
 
15
@@ -52,7 +48,7 @@
 
16
 # Check if the value in GLOBAL Table matches value in variable  #
 
17
 #################################################################
 
18
 
 
19
-SELECT @@GLOBAL.innodb_file_per_table = VARIABLE_VALUE
 
20
+SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE
 
21
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 
22
 WHERE VARIABLE_NAME='innodb_file_per_table';
 
23
 --echo 1 Expected
 
24
diff mysql-test/t/innodb_file_per_table_basic.result.orig mysql-test/t/innodb_file_per_table_basic.result
 
25
--- mysql-test/r/innodb_file_per_table_basic.result.orig        2008-10-07 11:32:02.000000000 +0300
 
26
+++ mysql-test/r/innodb_file_per_table_basic.result     2008-10-07 11:52:47.000000000 +0300
 
27
@@ -4,18 +4,15 @@
 
28
 1
 
29
 1 Expected
 
30
 '#---------------------BS_STVARS_028_02----------------------#'
 
31
-SET @@GLOBAL.innodb_file_per_table=1;
 
32
-ERROR HY000: Variable 'innodb_file_per_table' is a read only variable
 
33
-Expected error 'Read only variable'
 
34
 SELECT COUNT(@@GLOBAL.innodb_file_per_table);
 
35
 COUNT(@@GLOBAL.innodb_file_per_table)
 
36
 1
 
37
 1 Expected
 
38
 '#---------------------BS_STVARS_028_03----------------------#'
 
39
-SELECT @@GLOBAL.innodb_file_per_table = VARIABLE_VALUE
 
40
+SELECT IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE
 
41
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
 
42
 WHERE VARIABLE_NAME='innodb_file_per_table';
 
43
-@@GLOBAL.innodb_file_per_table = VARIABLE_VALUE
 
44
+IF(@@GLOBAL.innodb_file_per_table,'ON','OFF') = VARIABLE_VALUE
 
45
 1
 
46
 1 Expected
 
47
 SELECT COUNT(@@GLOBAL.innodb_file_per_table);