diff options
| author | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-08-08 17:45:43 +0100 |
|---|---|---|
| committer | Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com> | 2011-08-08 17:45:43 +0100 |
| commit | 0619bd57028a27a4bb58ca0dec8e5889f3d96a8e (patch) | |
| tree | cc3e4367c702b80f1519e45cda93846dc00c8c2b /mysql-test/r/sp_trans.result | |
| parent | 5962cadcfae4f8b7842578ab308798a9b5295a32 (diff) | |
| parent | e6bc34e2c375545dd77c4655c6b3071cb1879339 (diff) | |
| download | mariadb-git-0619bd57028a27a4bb58ca0dec8e5889f3d96a8e.tar.gz | |
manual merge
Diffstat (limited to 'mysql-test/r/sp_trans.result')
| -rw-r--r-- | mysql-test/r/sp_trans.result | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/mysql-test/r/sp_trans.result b/mysql-test/r/sp_trans.result index 4163725a196..b91dc898f12 100644 --- a/mysql-test/r/sp_trans.result +++ b/mysql-test/r/sp_trans.result @@ -558,6 +558,52 @@ 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'| +Variable_name Value +storage_engine InnoDB +SHOW SESSION VARIABLES LIKE 'storage_engine'| +Variable_name Value +storage_engine InnoDB +CREATE PROCEDURE bug11758414() +BEGIN +SET @@GLOBAL.storage_engine="MyISAM"; +SET @@SESSION.storage_engine="MyISAM"; +# show defaults at execution time / that setting them worked +SHOW GLOBAL VARIABLES LIKE 'storage_engine'; +SHOW SESSION VARIABLES LIKE '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!) + SHOW CREATE TABLE t1; + # show that we didn't break explicit override with ENGINE=... +SHOW CREATE TABLE t2; +END; +| +CALL bug11758414| +Variable_name Value +storage_engine MyISAM +Variable_name Value +storage_engine MyISAM +Table Create Table +t1 CREATE TABLE `t1` ( + `id` int(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +Table Create Table +t2 CREATE TABLE `t2` ( + `id` int(11) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=latin1 +SHOW GLOBAL VARIABLES LIKE 'storage_engine'| +Variable_name Value +storage_engine MyISAM +SHOW SESSION VARIABLES LIKE 'storage_engine'| +Variable_name Value +storage_engine MyISAM +DROP PROCEDURE bug11758414| +DROP TABLE t1, t2| +SET @@GLOBAL.storage_engine=@old_engine| # # End of 5.1 tests # |