diff options
Diffstat (limited to 'mysql-test/main/sp_trans.result')
| -rw-r--r-- | mysql-test/main/sp_trans.result | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mysql-test/main/sp_trans.result b/mysql-test/main/sp_trans.result index cee2a7e5188..58ef4ad15f7 100644 --- a/mysql-test/main/sp_trans.result +++ b/mysql-test/main/sp_trans.result @@ -557,22 +557,22 @@ f1 bug13575(f1) 3 ccc drop function bug13575| drop table t3| -SELECT @@GLOBAL.storage_engine INTO @old_engine| -SET @@GLOBAL.storage_engine=InnoDB| -SET @@SESSION.storage_engine=InnoDB| -SHOW GLOBAL VARIABLES LIKE 'storage_engine'| +SELECT @@GLOBAL.default_storage_engine INTO @old_engine| +SET @@GLOBAL.default_storage_engine=InnoDB| +SET @@SESSION.default_storage_engine=InnoDB| +SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'| Variable_name Value -storage_engine InnoDB -SHOW SESSION VARIABLES LIKE 'storage_engine'| +default_storage_engine InnoDB +SHOW SESSION VARIABLES LIKE 'default_storage_engine'| Variable_name Value -storage_engine InnoDB +default_storage_engine InnoDB CREATE PROCEDURE bug11758414() BEGIN -SET @@GLOBAL.storage_engine="MyISAM"; -SET @@SESSION.storage_engine="MyISAM"; +SET @@GLOBAL.default_storage_engine="MyISAM"; +SET @@SESSION.default_storage_engine="MyISAM"; # show defaults at execution time / that setting them worked -SHOW GLOBAL VARIABLES LIKE 'storage_engine'; -SHOW SESSION VARIABLES LIKE 'storage_engine'; +SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'; +SHOW SESSION VARIABLES LIKE 'default_storage_engine'; CREATE TABLE t1 (id int); CREATE TABLE t2 (id int) ENGINE=InnoDB; # show we're heeding the default (at run-time, not parse-time!) @@ -583,9 +583,9 @@ END; | CALL bug11758414| Variable_name Value -storage_engine MyISAM +default_storage_engine MyISAM Variable_name Value -storage_engine MyISAM +default_storage_engine MyISAM Table Create Table t1 CREATE TABLE `t1` ( `id` int(11) DEFAULT NULL @@ -594,15 +594,15 @@ Table Create Table t2 CREATE TABLE `t2` ( `id` int(11) DEFAULT NULL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 -SHOW GLOBAL VARIABLES LIKE 'storage_engine'| +SHOW GLOBAL VARIABLES LIKE 'default_storage_engine'| Variable_name Value -storage_engine MyISAM -SHOW SESSION VARIABLES LIKE 'storage_engine'| +default_storage_engine MyISAM +SHOW SESSION VARIABLES LIKE 'default_storage_engine'| Variable_name Value -storage_engine MyISAM +default_storage_engine MyISAM DROP PROCEDURE bug11758414| DROP TABLE t1, t2| -SET @@GLOBAL.storage_engine=@old_engine| +SET @@GLOBAL.default_storage_engine=@old_engine| # # End of 5.1 tests # |