=== modified file 'mysql-test/suite/nist/include/nist-drop.inc'
--- mysql-test/suite/nist/include/nist-drop.inc	2009-05-28 12:41:38 +0000
+++ mysql-test/suite/nist/include/nist-drop.inc	2010-12-29 05:52:57 +0000
@@ -18,7 +18,7 @@
 
 ########### RESET GLOBAL VARIABLES to their initial state
 
-SET GLOBAL STORAGE_ENGINE=@global_storage_engine;
+SET GLOBAL DEFAULT_STORAGE_ENGINE=@global_default_storage_engine;
 SET GLOBAL SQL_MODE = @global_sql_mode;
 SET SESSION SQL_MODE = @global_sql_mode;
 SET GLOBAL CHARACTER_SET_SERVER= @global_character_set_server;

=== modified file 'mysql-test/suite/nist/include/nist-env.inc'
--- mysql-test/suite/nist/include/nist-env.inc	2010-10-07 19:10:19 +0000
+++ mysql-test/suite/nist/include/nist-env.inc	2010-12-29 05:52:57 +0000
@@ -23,8 +23,8 @@
 # 1.1 check that the running MySQL kernel is able to handle InnoDB tables
 --source include/have_innodb.inc
 # 1.2 Set the default storage engine to InnoDB
-SET @global_storage_engine = @@global.storage_engine;
-SET GLOBAL STORAGE_ENGINE=INNODB;
+SET @global_default_storage_engine = @@global.default_storage_engine;
+SET GLOBAL DEFAULT_STORAGE_ENGINE=INNODB;
 #
 #
 # 2. There are explicit coded ROLLBACKs and COMMITs. -> Switch AUTOCOMMIT OFF

=== modified file 'mysql-test/suite/nist/r/nist-drop.result'
--- mysql-test/suite/nist/r/nist-drop.result	2009-05-28 12:41:38 +0000
+++ mysql-test/suite/nist/r/nist-drop.result	2010-12-29 05:52:57 +0000
@@ -1,7 +1,7 @@
 
 -------------- suite/nist/include/nist-drop.inc -------------------------
 
-SET GLOBAL STORAGE_ENGINE=@global_storage_engine;
+SET GLOBAL DEFAULT_STORAGE_ENGINE=@global_default_storage_engine;
 SET GLOBAL SQL_MODE = @global_sql_mode;
 SET SESSION SQL_MODE = @global_sql_mode;
 SET GLOBAL CHARACTER_SET_SERVER= @global_character_set_server;

=== modified file 'mysql-test/suite/nist/r/nist-env.result'
--- mysql-test/suite/nist/r/nist-env.result	2010-10-07 19:10:19 +0000
+++ mysql-test/suite/nist/r/nist-env.result	2010-12-29 05:52:57 +0000
@@ -1,5 +1,5 @@
-SET @global_storage_engine = @@global.storage_engine;
-SET GLOBAL STORAGE_ENGINE=INNODB;
+SET @global_default_storage_engine = @@global.default_storage_engine;
+SET GLOBAL DEFAULT_STORAGE_ENGINE=INNODB;
 SET AUTOCOMMIT = 0;
 SET @global_sql_mode=@@global.sql_mode;
 SET GLOBAL sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,PAD_CHAR_TO_FULL_LENGTH' ;

=== modified file 'mysql-test/suite/nist/r/nist_all.result'
--- mysql-test/suite/nist/r/nist_all.result	2010-10-07 19:10:19 +0000
+++ mysql-test/suite/nist/r/nist_all.result	2010-12-29 05:52:57 +0000
@@ -1,5 +1,5 @@
-SET @global_storage_engine = @@global.storage_engine;
-SET GLOBAL STORAGE_ENGINE=INNODB;
+SET @global_default_storage_engine = @@global.default_storage_engine;
+SET GLOBAL DEFAULT_STORAGE_ENGINE=INNODB;
 SET AUTOCOMMIT = 0;
 SET @global_sql_mode=@@global.sql_mode;
 SET GLOBAL sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,PAD_CHAR_TO_FULL_LENGTH' ;
@@ -981,7 +981,7 @@
 TEST-INFO: passed
 
 GRANT SELECT ON CUGINI.BADG2 TO SCHANZLE@localhost;
-ERROR 42000: SELECT,GRANT command denied to user 'FLATER'@'localhost' for table 'BADG2'
+ERROR 42000: SELECT, GRANT command denied to user 'FLATER'@'localhost' for table 'BADG2'
 
 TEST-INFO: passed
 
@@ -11943,7 +11943,7 @@
 E3 	13	Vienna         
 COMMIT WORK;
 DROP VIEW STAFF CASCADE;
-ERROR 42S02: Unknown table 'STAFF'
+ERROR 42S02: Unknown table 'FLATER.STAFF'
 
 TEST-INFO: The last statement failed, because MySQL does not
  - understand the syntax or
@@ -16160,7 +16160,7 @@
 
 -------------- suite/nist/include/nist-drop.inc -------------------------
 
-SET GLOBAL STORAGE_ENGINE=@global_storage_engine;
+SET GLOBAL DEFAULT_STORAGE_ENGINE=@global_default_storage_engine;
 SET GLOBAL SQL_MODE = @global_sql_mode;
 SET SESSION SQL_MODE = @global_sql_mode;
 SET GLOBAL CHARACTER_SET_SERVER= @global_character_set_server;
@@ -16209,7 +16209,7 @@
 
 -------------- suite/nist/include/nist-drop.inc -------------------------
 
-SET GLOBAL STORAGE_ENGINE=@global_storage_engine;
+SET GLOBAL DEFAULT_STORAGE_ENGINE=@global_default_storage_engine;
 SET GLOBAL SQL_MODE = @global_sql_mode;
 SET SESSION SQL_MODE = @global_sql_mode;
 SET GLOBAL CHARACTER_SET_SERVER= @global_character_set_server;

=== modified file 'mysql-test/suite/nist/r/nist_data.result'
--- mysql-test/suite/nist/r/nist_data.result	2010-10-07 19:10:19 +0000
+++ mysql-test/suite/nist/r/nist_data.result	2010-12-29 05:52:57 +0000
@@ -1,5 +1,5 @@
-SET @global_storage_engine = @@global.storage_engine;
-SET GLOBAL STORAGE_ENGINE=INNODB;
+SET @global_default_storage_engine = @@global.default_storage_engine;
+SET GLOBAL DEFAULT_STORAGE_ENGINE=INNODB;
 SET AUTOCOMMIT = 0;
 SET @global_sql_mode=@@global.sql_mode;
 SET GLOBAL sql_mode = 'PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,PAD_CHAR_TO_FULL_LENGTH' ;