summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/Makefile.am2
-rw-r--r--mysql-test/include/add_anonymous_users.inc7
-rw-r--r--mysql-test/include/delete_anonymous_users.inc5
-rw-r--r--mysql-test/init_db.sql58
-rw-r--r--mysql-test/lib/init_db.sql559
-rwxr-xr-xmysql-test/mysql-test-run.pl71
-rw-r--r--mysql-test/r/create.result2
-rw-r--r--mysql-test/r/derived.result2
-rw-r--r--mysql-test/r/join.result2
-rw-r--r--mysql-test/r/mysql_upgrade.result30
-rw-r--r--mysql-test/r/sp-security.result6
-rw-r--r--mysql-test/t/create.test4
-rw-r--r--mysql-test/t/derived.test7
-rw-r--r--mysql-test/t/grant2.test4
-rw-r--r--mysql-test/t/grant_cache.test6
-rw-r--r--mysql-test/t/init_connect.test4
-rw-r--r--mysql-test/t/lock_multi.test6
-rw-r--r--mysql-test/t/ndb_basic.test6
-rw-r--r--mysql-test/t/ndb_index_ordered.test4
-rw-r--r--mysql-test/t/ndb_multi.test4
-rw-r--r--mysql-test/t/overflow.test2
-rw-r--r--mysql-test/t/rpl_temporary.test10
-rw-r--r--mysql-test/t/xa.test2
23 files changed, 103 insertions, 700 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index ed85f06fcc5..d48b8c7dfe4 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -66,7 +66,6 @@ dist-hook:
$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data
$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data
$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data
- $(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(distdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
install-data-local:
@@ -98,7 +97,6 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data
$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(testdir)/std_data
$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data
- $(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
uninstall-local:
diff --git a/mysql-test/include/add_anonymous_users.inc b/mysql-test/include/add_anonymous_users.inc
new file mode 100644
index 00000000000..a59aa971d59
--- /dev/null
+++ b/mysql-test/include/add_anonymous_users.inc
@@ -0,0 +1,7 @@
+# Allow anonymous users to connect
+disable_warnings;
+disable_query_log;
+INSERT INTO mysql.user (host, user) VALUES ('localhost','');
+FLUSH PRIVILEGES;
+enable_query_log;
+enable_warnings;
diff --git a/mysql-test/include/delete_anonymous_users.inc b/mysql-test/include/delete_anonymous_users.inc
new file mode 100644
index 00000000000..9f642223748
--- /dev/null
+++ b/mysql-test/include/delete_anonymous_users.inc
@@ -0,0 +1,5 @@
+# Remove anonymous users added by add_anonymous_users.inc
+disable_query_log;
+DELETE FROM mysql.user where host='localhost' and user='';
+FLUSH PRIVILEGES;
+enable_query_log;
diff --git a/mysql-test/init_db.sql b/mysql-test/init_db.sql
deleted file mode 100644
index 63483af00d6..00000000000
--- a/mysql-test/init_db.sql
+++ /dev/null
@@ -1,58 +0,0 @@
-CREATE DATABASE mysql;
-CREATE DATABASE test;
-
-USE mysql;
-
-
-CREATE TABLE db (Host char(60) binary DEFAULT '' NOT NULL,Db char(64) binary DEFAULT '' NOT NULL,User char(16) binary DEFAULT '' NOT NULL,Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL,References_priv enum('N','Y') DEFAULT 'N' NOT NULL,Index_priv enum('N','Y') DEFAULT 'N' NOT NULL,Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL,Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,PRIMARY KEY Host (Host,Db,User),KEY User (User)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Database privileges';
-
-INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
-INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');
-
-
-CREATE TABLE host (Host char(60) binary DEFAULT '' NOT NULL,Db char(64) binary DEFAULT '' NOT NULL,Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL,References_priv enum('N','Y') DEFAULT 'N' NOT NULL,Index_priv enum('N','Y') DEFAULT 'N' NOT NULL,Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL,Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,PRIMARY KEY Host (Host,Db)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Host privileges; Merged with database privileges';
-
-CREATE TABLE user (Host char(60) binary DEFAULT '' NOT NULL,User char(16) binary DEFAULT '' NOT NULL,Password char(41) binary DEFAULT '' NOT NULL,Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,Delete_priv enum('N','Y') DEFAULT 'N' NOT NULL,Create_priv enum('N','Y') DEFAULT 'N' NOT NULL,Drop_priv enum('N','Y') DEFAULT 'N' NOT NULL,Reload_priv enum('N','Y') DEFAULT 'N' NOT NULL,Shutdown_priv enum('N','Y') DEFAULT 'N' NOT NULL,Process_priv enum('N','Y') DEFAULT 'N' NOT NULL,File_priv enum('N','Y') DEFAULT 'N' NOT NULL,Grant_priv enum('N','Y') DEFAULT 'N' NOT NULL,References_priv enum('N','Y') DEFAULT 'N' NOT NULL,Index_priv enum('N','Y') DEFAULT 'N' NOT NULL,Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL,Show_db_priv enum('N','Y') DEFAULT 'N' NOT NULL,Super_priv enum('N','Y') DEFAULT 'N' NOT NULL,Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL,Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL,Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL,Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL,ssl_type enum('','ANY','X509', 'SPECIFIED') DEFAULT '' NOT NULL,ssl_cipher BLOB NOT NULL,x509_issuer BLOB NOT NULL,x509_subject BLOB NOT NULL,max_questions int(11) unsigned DEFAULT 0 NOT NULL,max_updates int(11) unsigned DEFAULT 0 NOT NULL,max_connections int(11) unsigned DEFAULT 0 NOT NULL,PRIMARY KEY Host (Host,User)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Users and global privileges';
-
-INSERT INTO user VALUES ('%','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);
-INSERT INTO user VALUES ('%','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0);
-
-CREATE TABLE func (name char(64) binary DEFAULT '' NOT NULL,ret tinyint(1) DEFAULT '0' NOT NULL,dl char(128) DEFAULT '' NOT NULL,type enum ('function','aggregate') NOT NULL,PRIMARY KEY (name)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User defined functions';
-
-CREATE TABLE tables_priv (Host char(60) binary DEFAULT '' NOT NULL,Db char(64) binary DEFAULT '' NOT NULL,User char(16) binary DEFAULT '' NOT NULL,Table_name char(64) binary DEFAULT '' NOT NULL,Grantor char(77) DEFAULT '' NOT NULL,Timestamp timestamp(14),Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL,Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL,PRIMARY KEY (Host,Db,User,Table_name),KEY Grantor (Grantor)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges';
-
-CREATE TABLE columns_priv (Host char(60) binary DEFAULT '' NOT NULL,Db char(64) binary DEFAULT '' NOT NULL,User char(16) binary DEFAULT '' NOT NULL,Table_name char(64) binary DEFAULT '' NOT NULL,Column_name char(64) binary DEFAULT '' NOT NULL,Timestamp timestamp(14),Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL,PRIMARY KEY (Host,Db,User,Table_name,Column_name)) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges';
-
-CREATE TABLE help_topic (help_topic_id int unsigned not null,name varchar(64) not null,help_category_id smallint unsigned not null,description text not null,example text not null,url varchar(128) not null,primary key (help_topic_id),unique index (name)) engine=MyISAM CHARACTER SET utf8 comment='help topics';
-
-CREATE TABLE help_category (help_category_id smallint unsigned not null,name varchar(64) not null,parent_category_id smallint unsigned null,url varchar(128) not null,primary key (help_category_id),unique index (name)) engine=MyISAM CHARACTER SET utf8 comment='help categories';
-
-CREATE TABLE help_keyword (help_keyword_id int unsigned not null,name varchar(64) not null,primary key (help_keyword_id),unique index (name)) engine=MyISAM CHARACTER SET utf8 comment='help keywords';
-
-CREATE TABLE help_relation (help_topic_id int unsigned not null references help_topic,help_keyword_id int unsigned not null references help_keyword,primary key (help_keyword_id, help_topic_id)) engine=MyISAM CHARACTER SET utf8 comment='keyword-topic relation';
-
-CREATE TABLE time_zone_name (Name char(64) NOT NULL,Time_zone_id int unsigned NOT NULL,PRIMARY KEY Name (Name)) engine=MyISAM CHARACTER SET utf8 comment='Time zone names';
-
-INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES ('MET', 1), ('UTC', 2), ('Universal', 2), ('Europe/Moscow',3), ('leap/Europe/Moscow',4), ('Japan', 5);
-
-
-CREATE TABLE time_zone (Time_zone_id int unsigned NOT NULL auto_increment,Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL,PRIMARY KEY TzId (Time_zone_id)) engine=MyISAM CHARACTER SET utf8 comment='Time zones';
-
-INSERT INTO time_zone (Time_zone_id, Use_leap_seconds) VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y'), (5,'N');
-
-
-CREATE TABLE time_zone_transition (Time_zone_id int unsigned NOT NULL,Transition_time bigint signed NOT NULL,Transition_type_id int unsigned NOT NULL,PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time)) engine=MyISAM CHARACTER SET utf8 comment='Time zone transitions';
-
-INSERT INTO time_zone_transition (Time_zone_id, Transition_time, Transition_type_id) VALUES (1, -1693706400, 0) ,(1, -1680483600, 1),(1, -1663455600, 2) ,(1, -1650150000, 3),(1, -1632006000, 2) ,(1, -1618700400, 3),(1, -938905200, 2) ,(1, -857257200, 3),(1, -844556400, 2) ,(1, -828226800, 3),(1, -812502000, 2) ,(1, -796777200, 3),(1, 228877200, 2) ,(1, 243997200, 3),(1, 260326800, 2) ,(1, 276051600, 3),(1, 291776400, 2) ,(1, 307501200, 3),(1, 323830800, 2) ,(1, 338950800, 3),(1, 354675600, 2) ,(1, 370400400, 3),(1, 386125200, 2) ,(1, 401850000, 3),(1, 417574800, 2) ,(1, 433299600, 3),(1, 449024400, 2) ,(1, 465354000, 3),(1, 481078800, 2) ,(1, 496803600, 3),(1, 512528400, 2) ,(1, 528253200, 3),(1, 543978000, 2) ,(1, 559702800, 3),(1, 575427600, 2) ,(1, 591152400, 3),(1, 606877200, 2) ,(1, 622602000, 3),(1, 638326800, 2) ,(1, 654656400, 3),(1, 670381200, 2) ,(1, 686106000, 3),(1, 701830800, 2) ,(1, 717555600, 3),(1, 733280400, 2) ,(1, 749005200, 3),(1, 764730000, 2) ,(1, 780454800, 3),(1, 796179600, 2) ,(1, 811904400, 3),(1, 828234000, 2) ,(1, 846378000, 3),(1, 859683600, 2) ,(1, 877827600, 3),(1, 891133200, 2) ,(1, 909277200, 3),(1, 922582800, 2) ,(1, 941331600, 3),(1, 954032400, 2) ,(1, 972781200, 3),(1, 985482000, 2) ,(1, 1004230800, 3),(1, 1017536400, 2) ,(1, 1035680400, 3),(1, 1048986000, 2) ,(1, 1067130000, 3),(1, 1080435600, 2) ,(1, 1099184400, 3),(1, 1111885200, 2) ,(1, 1130634000, 3),(1, 1143334800, 2) ,(1, 1162083600, 3),(1, 1174784400, 2) ,(1, 1193533200, 3),(1, 1206838800, 2) ,(1, 1224982800, 3),(1, 1238288400, 2) ,(1, 1256432400, 3),(1, 1269738000, 2) ,(1, 1288486800, 3),(1, 1301187600, 2) ,(1, 1319936400, 3),(1, 1332637200, 2) ,(1, 1351386000, 3),(1, 1364691600, 2) ,(1, 1382835600, 3),(1, 1396141200, 2) ,(1, 1414285200, 3),(1, 1427590800, 2) ,(1, 1445734800, 3),(1, 1459040400, 2) ,(1, 1477789200, 3),(1, 1490490000, 2) ,(1, 1509238800, 3),(1, 1521939600, 2) ,(1, 1540688400, 3),(1, 1553994000, 2) ,(1, 1572138000, 3),(1, 1585443600, 2) ,(1, 1603587600, 3),(1, 1616893200, 2) ,(1, 1635642000, 3),(1, 1648342800, 2) ,(1, 1667091600, 3),(1, 1679792400, 2) ,(1, 1698541200, 3),(1, 1711846800, 2) ,(1, 1729990800, 3),(1, 1743296400, 2) ,(1, 1761440400, 3),(1, 1774746000, 2) ,(1, 1792890000, 3),(1, 1806195600, 2) ,(1, 1824944400, 3),(1, 1837645200, 2) ,(1, 1856394000, 3),(1, 1869094800, 2) ,(1, 1887843600, 3),(1, 1901149200, 2) ,(1, 1919293200, 3),(1, 1932598800, 2) ,(1, 1950742800, 3),(1, 1964048400, 2) ,(1, 1982797200, 3),(1, 1995498000, 2) ,(1, 2014246800, 3),(1, 2026947600, 2) ,(1, 2045696400, 3),(1, 2058397200, 2) ,(1, 2077146000, 3),(1, 2090451600, 2) ,(1, 2108595600, 3),(1, 2121901200, 2) ,(1, 2140045200, 3),(3, -1688265000, 2) ,(3, -1656819048, 1),(3, -1641353448, 2) ,(3, -1627965048, 3),(3, -1618716648, 1) ,(3, -1596429048, 3),(3, -1593829848, 5) ,(3, -1589860800, 4),(3, -1542427200, 5) ,(3, -1539493200, 6),(3, -1525323600, 5) ,(3, -1522728000, 4),(3, -1491188400, 7) ,(3, -1247536800, 4),(3, 354920400, 5) ,(3, 370728000, 4),(3, 386456400, 5) ,(3, 402264000, 4),(3, 417992400, 5) ,(3, 433800000, 4),(3, 449614800, 5) ,(3, 465346800, 8),(3, 481071600, 9) ,(3, 496796400, 8),(3, 512521200, 9) ,(3, 528246000, 8),(3, 543970800, 9) ,(3, 559695600, 8),(3, 575420400, 9) ,(3, 591145200, 8),(3, 606870000, 9) ,(3, 622594800, 8),(3, 638319600, 9) ,(3, 654649200, 8),(3, 670374000, 10) ,(3, 686102400, 11),(3, 695779200, 8) ,(3, 701812800, 5),(3, 717534000, 4) ,(3, 733273200, 9),(3, 748998000, 8) ,(3, 764722800, 9),(3, 780447600, 8) ,(3, 796172400, 9),(3, 811897200, 8) ,(3, 828226800, 9),(3, 846370800, 8) ,(3, 859676400, 9),(3, 877820400, 8) ,(3, 891126000, 9),(3, 909270000, 8) ,(3, 922575600, 9),(3, 941324400, 8) ,(3, 954025200, 9),(3, 972774000, 8) ,(3, 985474800, 9),(3, 1004223600, 8) ,(3, 1017529200, 9),(3, 1035673200, 8) ,(3, 1048978800, 9),(3, 1067122800, 8) ,(3, 1080428400, 9),(3, 1099177200, 8) ,(3, 1111878000, 9),(3, 1130626800, 8) ,(3, 1143327600, 9),(3, 1162076400, 8) ,(3, 1174777200, 9),(3, 1193526000, 8) ,(3, 1206831600, 9),(3, 1224975600, 8) ,(3, 1238281200, 9),(3, 1256425200, 8) ,(3, 1269730800, 9),(3, 1288479600, 8) ,(3, 1301180400, 9),(3, 1319929200, 8) ,(3, 1332630000, 9),(3, 1351378800, 8) ,(3, 1364684400, 9),(3, 1382828400, 8) ,(3, 1396134000, 9),(3, 1414278000, 8) ,(3, 1427583600, 9),(3, 1445727600, 8) ,(3, 1459033200, 9),(3, 1477782000, 8) ,(3, 1490482800, 9),(3, 1509231600, 8) ,(3, 1521932400, 9),(3, 1540681200, 8) ,(3, 1553986800, 9),(3, 1572130800, 8) ,(3, 1585436400, 9),(3, 1603580400, 8) ,(3, 1616886000, 9),(3, 1635634800, 8) ,(3, 1648335600, 9),(3, 1667084400, 8) ,(3, 1679785200, 9),(3, 1698534000, 8) ,(3, 1711839600, 9),(3, 1729983600, 8) ,(3, 1743289200, 9),(3, 1761433200, 8) ,(3, 1774738800, 9),(3, 1792882800, 8) ,(3, 1806188400, 9),(3, 1824937200, 8) ,(3, 1837638000, 9),(3, 1856386800, 8) ,(3, 1869087600, 9),(3, 1887836400, 8) ,(3, 1901142000, 9),(3, 1919286000, 8) ,(3, 1932591600, 9),(3, 1950735600, 8) ,(3, 1964041200, 9),(3, 1982790000, 8) ,(3, 1995490800, 9),(3, 2014239600, 8) ,(3, 2026940400, 9),(3, 2045689200, 8) ,(3, 2058390000, 9),(3, 2077138800, 8) ,(3, 2090444400, 9),(3, 2108588400, 8) ,(3, 2121894000, 9),(3, 2140038000, 8),(4, -1688265000, 2) ,(4, -1656819048, 1),(4, -1641353448, 2) ,(4, -1627965048, 3),(4, -1618716648, 1) ,(4, -1596429048, 3),(4, -1593829848, 5) ,(4, -1589860800, 4),(4, -1542427200, 5) ,(4, -1539493200, 6),(4, -1525323600, 5) ,(4, -1522728000, 4),(4, -1491188400, 7) ,(4, -1247536800, 4),(4, 354920409, 5) ,(4, 370728010, 4),(4, 386456410, 5) ,(4, 402264011, 4),(4, 417992411, 5) ,(4, 433800012, 4),(4, 449614812, 5) ,(4, 465346812, 8),(4, 481071612, 9) ,(4, 496796413, 8),(4, 512521213, 9) ,(4, 528246013, 8),(4, 543970813, 9) ,(4, 559695613, 8),(4, 575420414, 9) ,(4, 591145214, 8),(4, 606870014, 9) ,(4, 622594814, 8),(4, 638319615, 9) ,(4, 654649215, 8),(4, 670374016, 10) ,(4, 686102416, 11),(4, 695779216, 8) ,(4, 701812816, 5),(4, 717534017, 4) ,(4, 733273217, 9),(4, 748998018, 8) ,(4, 764722818, 9),(4, 780447619, 8) ,(4, 796172419, 9),(4, 811897219, 8) ,(4, 828226820, 9),(4, 846370820, 8) ,(4, 859676420, 9),(4, 877820421, 8) ,(4, 891126021, 9),(4, 909270021, 8) ,(4, 922575622, 9),(4, 941324422, 8) ,(4, 954025222, 9),(4, 972774022, 8) ,(4, 985474822, 9),(4, 1004223622, 8) ,(4, 1017529222, 9),(4, 1035673222, 8) ,(4, 1048978822, 9),(4, 1067122822, 8) ,(4, 1080428422, 9),(4, 1099177222, 8) ,(4, 1111878022, 9),(4, 1130626822, 8) ,(4, 1143327622, 9),(4, 1162076422, 8) ,(4, 1174777222, 9),(4, 1193526022, 8) ,(4, 1206831622, 9),(4, 1224975622, 8) ,(4, 1238281222, 9),(4, 1256425222, 8) ,(4, 1269730822, 9),(4, 1288479622, 8) ,(4, 1301180422, 9),(4, 1319929222, 8) ,(4, 1332630022, 9),(4, 1351378822, 8) ,(4, 1364684422, 9),(4, 1382828422, 8) ,(4, 1396134022, 9),(4, 1414278022, 8) ,(4, 1427583622, 9),(4, 1445727622, 8) ,(4, 1459033222, 9),(4, 1477782022, 8) ,(4, 1490482822, 9),(4, 1509231622, 8) ,(4, 1521932422, 9),(4, 1540681222, 8) ,(4, 1553986822, 9),(4, 1572130822, 8) ,(4, 1585436422, 9),(4, 1603580422, 8) ,(4, 1616886022, 9),(4, 1635634822, 8) ,(4, 1648335622, 9),(4, 1667084422, 8) ,(4, 1679785222, 9),(4, 1698534022, 8) ,(4, 1711839622, 9),(4, 1729983622, 8) ,(4, 1743289222, 9),(4, 1761433222, 8) ,(4, 1774738822, 9),(4, 1792882822, 8) ,(4, 1806188422, 9),(4, 1824937222, 8) ,(4, 1837638022, 9),(4, 1856386822, 8) ,(4, 1869087622, 9),(4, 1887836422, 8) ,(4, 1901142022, 9),(4, 1919286022, 8) ,(4, 1932591622, 9),(4, 1950735622, 8) ,(4, 1964041222, 9),(4, 1982790022, 8) ,(4, 1995490822, 9),(4, 2014239622, 8) ,(4, 2026940422, 9),(4, 2045689222, 8) ,(4, 2058390022, 9),(4, 2077138822, 8) ,(4, 2090444422, 9),(4, 2108588422, 8) ,(4, 2121894022, 9),(4, 2140038022, 8);
-
-
-CREATE TABLE time_zone_transition_type (Time_zone_id int unsigned NOT NULL,Transition_type_id int unsigned NOT NULL,Offset int signed DEFAULT 0 NOT NULL,Is_DST tinyint unsigned DEFAULT 0 NOT NULL,Abbreviation char(8) DEFAULT '' NOT NULL,PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id)) engine=MyISAM CHARACTER SET utf8 comment='Time zone transition types';
-
-INSERT INTO time_zone_transition_type (Time_zone_id,Transition_type_id, Offset, Is_DST, Abbreviation) VALUES (1, 0, 7200, 1, 'MEST') ,(1, 1, 3600, 0, 'MET') ,(1, 2, 7200, 1, 'MEST') ,(1, 3, 3600, 0, 'MET') ,(2, 0, 0, 0, 'UTC') ,(3, 0, 9000, 0, 'MMT') ,(3, 1, 12648, 1, 'MST') ,(3, 2, 9048, 0, 'MMT') ,(3, 3, 16248, 1, 'MDST') ,(3, 4, 10800, 0, 'MSK') ,(3, 5, 14400, 1, 'MSD') ,(3, 6, 18000, 1, 'MSD') ,(3, 7, 7200, 0, 'EET') ,(3, 8, 10800, 0, 'MSK') ,(3, 9, 14400, 1, 'MSD') ,(3, 10, 10800, 1, 'EEST') ,(3, 11, 7200, 0, 'EET') ,(4, 0, 9000, 0, 'MMT') ,(4, 1, 12648, 1, 'MST') ,(4, 2, 9048, 0, 'MMT') ,(4, 3, 16248, 1, 'MDST') ,(4, 4, 10800, 0, 'MSK') ,(4, 5, 14400, 1, 'MSD') ,(4, 6, 18000, 1, 'MSD') ,(4, 7, 7200, 0, 'EET') ,(4, 8, 10800, 0, 'MSK') ,(4, 9, 14400, 1, 'MSD') ,(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET') ,(5, 0, 32400, 0, 'CJT') ,(5, 1, 32400, 0, 'JST');
-
-CREATE TABLE time_zone_leap_second (Transition_time bigint signed NOT NULL,Correction int signed NOT NULL,PRIMARY KEY TranTime (Transition_time)) engine=MyISAM CHARACTER SET utf8 comment='Leap seconds information for time zones';
-
-INSERT INTO time_zone_leap_second (Transition_time, Correction) VALUES (78796800, 1) ,(94694401, 2) ,(126230402, 3) ,(157766403, 4) ,(189302404, 5) ,(220924805, 6) ,(252460806, 7) ,(283996807, 8) ,(315532808, 9) ,(362793609, 10) ,(394329610, 11) ,(425865611, 12) ,(489024012, 13) ,(567993613, 14) ,(631152014, 15) ,(662688015, 16) ,(709948816, 17) ,(741484817, 18) ,(773020818, 19) ,(820454419, 20) ,(867715220, 21) ,(915148821, 22);
-
-
diff --git a/mysql-test/lib/init_db.sql b/mysql-test/lib/init_db.sql
deleted file mode 100644
index fd7b035e038..00000000000
--- a/mysql-test/lib/init_db.sql
+++ /dev/null
@@ -1,559 +0,0 @@
-use mysql;
-set table_type=myisam;
-
-CREATE TABLE db (
- Host char(60) binary DEFAULT '' NOT NULL,
- Db char(64) binary DEFAULT '' NOT NULL,
- User char(16) binary DEFAULT '' NOT NULL,
- Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- PRIMARY KEY Host (Host,Db,User),
- KEY User (User)
-) engine=MyISAM
-CHARACTER SET utf8 COLLATE utf8_bin
-comment='Database privileges';
-
-
-INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
-INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
-
-
-CREATE TABLE host (
- Host char(60) binary DEFAULT '' NOT NULL,
- Db char(64) binary DEFAULT '' NOT NULL,
- Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- PRIMARY KEY Host (Host,Db)
-) engine=MyISAM
-CHARACTER SET utf8 COLLATE utf8_bin
-comment='Host privileges; Merged with database privileges';
-
-
-CREATE TABLE user (
- Host char(60) binary DEFAULT '' NOT NULL,
- User char(16) binary DEFAULT '' NOT NULL,
- Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL,
- Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Delete_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Drop_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Reload_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Shutdown_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Process_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- File_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Grant_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- References_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Index_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Alter_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Show_db_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Super_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Repl_slave_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Repl_client_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- Create_user_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- ssl_type enum('','ANY','X509', 'SPECIFIED') COLLATE utf8_general_ci DEFAULT '' NOT NULL,
- ssl_cipher BLOB NOT NULL,
- x509_issuer BLOB NOT NULL,
- x509_subject BLOB NOT NULL,
- max_questions int(11) unsigned DEFAULT 0 NOT NULL,
- max_updates int(11) unsigned DEFAULT 0 NOT NULL,
- max_connections int(11) unsigned DEFAULT 0 NOT NULL,
- max_user_connections int(11) unsigned DEFAULT 0 NOT NULL,
- PRIMARY KEY Host (Host,User)
-) engine=MyISAM
-CHARACTER SET utf8 COLLATE utf8_bin
-comment='Users and global privileges';
-
-
-INSERT INTO user VALUES ('localhost' ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-INSERT INTO user VALUES ('@HOSTNAME@%' ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-REPLACE INTO user VALUES ('127.0.0.1' ,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-INSERT INTO user (host,user) VALUES ('localhost','');
-INSERT INTO user (host,user) VALUES ('@HOSTNAME@%','');
-
-
-CREATE TABLE func (
- name char(64) binary DEFAULT '' NOT NULL,
- ret tinyint(1) DEFAULT '0' NOT NULL,
- dl char(128) DEFAULT '' NOT NULL,
- type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL,
- PRIMARY KEY (name)
-) engine=MyISAM
-CHARACTER SET utf8 COLLATE utf8_bin
-comment='User defined functions';
-
-
-CREATE TABLE tables_priv (
- Host char(60) binary DEFAULT '' NOT NULL,
- Db char(64) binary DEFAULT '' NOT NULL,
- User char(16) binary DEFAULT '' NOT NULL,
- Table_name char(64) binary DEFAULT '' NOT NULL,
- Grantor char(77) DEFAULT '' NOT NULL,
- Timestamp timestamp(14),
- Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL,
- Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL,
- PRIMARY KEY (Host,Db,User,Table_name),KEY Grantor (Grantor)
-) engine=MyISAM
-CHARACTER SET utf8 COLLATE utf8_bin
-comment='Table privileges';
-
-
-CREATE TABLE columns_priv (
- Host char(60) binary DEFAULT '' NOT NULL,
- Db char(64) binary DEFAULT '' NOT NULL,
- User char(16) binary DEFAULT '' NOT NULL,
- Table_name char(64) binary DEFAULT '' NOT NULL,
- Column_name char(64) binary DEFAULT '' NOT NULL,
- Timestamp timestamp(14),
- Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL,
- PRIMARY KEY (Host,Db,User,Table_name,Column_name)
-) engine=MyISAM
-CHARACTER SET utf8 COLLATE utf8_bin
-comment='Column privileges';
-
-
-CREATE TABLE help_topic (
- help_topic_id int unsigned not null,
- name char(64) not null,
- help_category_id smallint unsigned not null,
- description text not null,
- example text not null,
- url char(128) not null,
- primary key (help_topic_id),
- unique index (name)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='help topics';
-
-
-CREATE TABLE help_category (
- help_category_id smallint unsigned not null,
- name char(64) not null,
- parent_category_id smallint unsigned null,
- url char(128) not null,
- primary key (help_category_id),unique index (name)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='help categories';
-
-
-CREATE TABLE help_keyword (
- help_keyword_id int unsigned not null,
- name char(64) not null,
- primary key (help_keyword_id),unique index (name)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='help keywords';
-
-
-CREATE TABLE help_relation (
- help_topic_id int unsigned not null references help_topic,
- help_keyword_id int unsigned not null references help_keyword,
- primary key (help_keyword_id, help_topic_id)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='keyword-topic relation';
-
-
-CREATE TABLE time_zone_name (
- Name char(64) NOT NULL,
- Time_zone_id int unsigned NOT NULL,
- PRIMARY KEY Name (Name)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='Time zone names';
-
-
-INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES
- ('MET', 1), ('UTC', 2), ('Universal', 2),
- ('Europe/Moscow',3), ('leap/Europe/Moscow',4),
- ('Japan', 5);
-
-
-CREATE TABLE time_zone (
- Time_zone_id int unsigned NOT NULL auto_increment,
- Use_leap_seconds enum('Y','N') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
- PRIMARY KEY TzId (Time_zone_id)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='Time zones';
-
-
-INSERT INTO time_zone (Time_zone_id, Use_leap_seconds)
- VALUES (1,'N'), (2,'N'), (3,'N'), (4,'Y'), (5,'N');
-
-
-CREATE TABLE time_zone_transition (
- Time_zone_id int unsigned NOT NULL,
- Transition_time bigint signed NOT NULL,
- Transition_type_id int unsigned NOT NULL,
- PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='Time zone transitions';
-
-
-INSERT INTO time_zone_transition
- (Time_zone_id, Transition_time, Transition_type_id)
-VALUES
- (1, -1693706400, 0) ,(1, -1680483600, 1)
- ,(1, -1663455600, 2) ,(1, -1650150000, 3)
- ,(1, -1632006000, 2) ,(1, -1618700400, 3)
- ,(1, -938905200, 2) ,(1, -857257200, 3)
- ,(1, -844556400, 2) ,(1, -828226800, 3)
- ,(1, -812502000, 2) ,(1, -796777200, 3)
- ,(1, 228877200, 2) ,(1, 243997200, 3)
- ,(1, 260326800, 2) ,(1, 276051600, 3)
- ,(1, 291776400, 2) ,(1, 307501200, 3)
- ,(1, 323830800, 2) ,(1, 338950800, 3)
- ,(1, 354675600, 2) ,(1, 370400400, 3)
- ,(1, 386125200, 2) ,(1, 401850000, 3)
- ,(1, 417574800, 2) ,(1, 433299600, 3)
- ,(1, 449024400, 2) ,(1, 465354000, 3)
- ,(1, 481078800, 2) ,(1, 496803600, 3)
- ,(1, 512528400, 2) ,(1, 528253200, 3)
- ,(1, 543978000, 2) ,(1, 559702800, 3)
- ,(1, 575427600, 2) ,(1, 591152400, 3)
- ,(1, 606877200, 2) ,(1, 622602000, 3)
- ,(1, 638326800, 2) ,(1, 654656400, 3)
- ,(1, 670381200, 2) ,(1, 686106000, 3)
- ,(1, 701830800, 2) ,(1, 717555600, 3)
- ,(1, 733280400, 2) ,(1, 749005200, 3)
- ,(1, 764730000, 2) ,(1, 780454800, 3)
- ,(1, 796179600, 2) ,(1, 811904400, 3)
- ,(1, 828234000, 2) ,(1, 846378000, 3)
- ,(1, 859683600, 2) ,(1, 877827600, 3)
- ,(1, 891133200, 2) ,(1, 909277200, 3)
- ,(1, 922582800, 2) ,(1, 941331600, 3)
- ,(1, 954032400, 2) ,(1, 972781200, 3)
- ,(1, 985482000, 2) ,(1, 1004230800, 3)
- ,(1, 1017536400, 2) ,(1, 1035680400, 3)
- ,(1, 1048986000, 2) ,(1, 1067130000, 3)
- ,(1, 1080435600, 2) ,(1, 1099184400, 3)
- ,(1, 1111885200, 2) ,(1, 1130634000, 3)
- ,(1, 1143334800, 2) ,(1, 1162083600, 3)
- ,(1, 1174784400, 2) ,(1, 1193533200, 3)
- ,(1, 1206838800, 2) ,(1, 1224982800, 3)
- ,(1, 1238288400, 2) ,(1, 1256432400, 3)
- ,(1, 1269738000, 2) ,(1, 1288486800, 3)
- ,(1, 1301187600, 2) ,(1, 1319936400, 3)
- ,(1, 1332637200, 2) ,(1, 1351386000, 3)
- ,(1, 1364691600, 2) ,(1, 1382835600, 3)
- ,(1, 1396141200, 2) ,(1, 1414285200, 3)
- ,(1, 1427590800, 2) ,(1, 1445734800, 3)
- ,(1, 1459040400, 2) ,(1, 1477789200, 3)
- ,(1, 1490490000, 2) ,(1, 1509238800, 3)
- ,(1, 1521939600, 2) ,(1, 1540688400, 3)
- ,(1, 1553994000, 2) ,(1, 1572138000, 3)
- ,(1, 1585443600, 2) ,(1, 1603587600, 3)
- ,(1, 1616893200, 2) ,(1, 1635642000, 3)
- ,(1, 1648342800, 2) ,(1, 1667091600, 3)
- ,(1, 1679792400, 2) ,(1, 1698541200, 3)
- ,(1, 1711846800, 2) ,(1, 1729990800, 3)
- ,(1, 1743296400, 2) ,(1, 1761440400, 3)
- ,(1, 1774746000, 2) ,(1, 1792890000, 3)
- ,(1, 1806195600, 2) ,(1, 1824944400, 3)
- ,(1, 1837645200, 2) ,(1, 1856394000, 3)
- ,(1, 1869094800, 2) ,(1, 1887843600, 3)
- ,(1, 1901149200, 2) ,(1, 1919293200, 3)
- ,(1, 1932598800, 2) ,(1, 1950742800, 3)
- ,(1, 1964048400, 2) ,(1, 1982797200, 3)
- ,(1, 1995498000, 2) ,(1, 2014246800, 3)
- ,(1, 2026947600, 2) ,(1, 2045696400, 3)
- ,(1, 2058397200, 2) ,(1, 2077146000, 3)
- ,(1, 2090451600, 2) ,(1, 2108595600, 3)
- ,(1, 2121901200, 2) ,(1, 2140045200, 3)
- ,(3, -1688265000, 2) ,(3, -1656819048, 1)
- ,(3, -1641353448, 2) ,(3, -1627965048, 3)
- ,(3, -1618716648, 1) ,(3, -1596429048, 3)
- ,(3, -1593829848, 5) ,(3, -1589860800, 4)
- ,(3, -1542427200, 5) ,(3, -1539493200, 6)
- ,(3, -1525323600, 5) ,(3, -1522728000, 4)
- ,(3, -1491188400, 7) ,(3, -1247536800, 4)
- ,(3, 354920400, 5) ,(3, 370728000, 4)
- ,(3, 386456400, 5) ,(3, 402264000, 4)
- ,(3, 417992400, 5) ,(3, 433800000, 4)
- ,(3, 449614800, 5) ,(3, 465346800, 8)
- ,(3, 481071600, 9) ,(3, 496796400, 8)
- ,(3, 512521200, 9) ,(3, 528246000, 8)
- ,(3, 543970800, 9) ,(3, 559695600, 8)
- ,(3, 575420400, 9) ,(3, 591145200, 8)
- ,(3, 606870000, 9) ,(3, 622594800, 8)
- ,(3, 638319600, 9) ,(3, 654649200, 8)
- ,(3, 670374000, 10) ,(3, 686102400, 11)
- ,(3, 695779200, 8) ,(3, 701812800, 5)
- ,(3, 717534000, 4) ,(3, 733273200, 9)
- ,(3, 748998000, 8) ,(3, 764722800, 9)
- ,(3, 780447600, 8) ,(3, 796172400, 9)
- ,(3, 811897200, 8) ,(3, 828226800, 9)
- ,(3, 846370800, 8) ,(3, 859676400, 9)
- ,(3, 877820400, 8) ,(3, 891126000, 9)
- ,(3, 909270000, 8) ,(3, 922575600, 9)
- ,(3, 941324400, 8) ,(3, 954025200, 9)
- ,(3, 972774000, 8) ,(3, 985474800, 9)
- ,(3, 1004223600, 8) ,(3, 1017529200, 9)
- ,(3, 1035673200, 8) ,(3, 1048978800, 9)
- ,(3, 1067122800, 8) ,(3, 1080428400, 9)
- ,(3, 1099177200, 8) ,(3, 1111878000, 9)
- ,(3, 1130626800, 8) ,(3, 1143327600, 9)
- ,(3, 1162076400, 8) ,(3, 1174777200, 9)
- ,(3, 1193526000, 8) ,(3, 1206831600, 9)
- ,(3, 1224975600, 8) ,(3, 1238281200, 9)
- ,(3, 1256425200, 8) ,(3, 1269730800, 9)
- ,(3, 1288479600, 8) ,(3, 1301180400, 9)
- ,(3, 1319929200, 8) ,(3, 1332630000, 9)
- ,(3, 1351378800, 8) ,(3, 1364684400, 9)
- ,(3, 1382828400, 8) ,(3, 1396134000, 9)
- ,(3, 1414278000, 8) ,(3, 1427583600, 9)
- ,(3, 1445727600, 8) ,(3, 1459033200, 9)
- ,(3, 1477782000, 8) ,(3, 1490482800, 9)
- ,(3, 1509231600, 8) ,(3, 1521932400, 9)
- ,(3, 1540681200, 8) ,(3, 1553986800, 9)
- ,(3, 1572130800, 8) ,(3, 1585436400, 9)
- ,(3, 1603580400, 8) ,(3, 1616886000, 9)
- ,(3, 1635634800, 8) ,(3, 1648335600, 9)
- ,(3, 1667084400, 8) ,(3, 1679785200, 9)
- ,(3, 1698534000, 8) ,(3, 1711839600, 9)
- ,(3, 1729983600, 8) ,(3, 1743289200, 9)
- ,(3, 1761433200, 8) ,(3, 1774738800, 9)
- ,(3, 1792882800, 8) ,(3, 1806188400, 9)
- ,(3, 1824937200, 8) ,(3, 1837638000, 9)
- ,(3, 1856386800, 8) ,(3, 1869087600, 9)
- ,(3, 1887836400, 8) ,(3, 1901142000, 9)
- ,(3, 1919286000, 8) ,(3, 1932591600, 9)
- ,(3, 1950735600, 8) ,(3, 1964041200, 9)
- ,(3, 1982790000, 8) ,(3, 1995490800, 9)
- ,(3, 2014239600, 8) ,(3, 2026940400, 9)
- ,(3, 2045689200, 8) ,(3, 2058390000, 9)
- ,(3, 2077138800, 8) ,(3, 2090444400, 9)
- ,(3, 2108588400, 8) ,(3, 2121894000, 9)
- ,(3, 2140038000, 8)
- ,(4, -1688265000, 2) ,(4, -1656819048, 1)
- ,(4, -1641353448, 2) ,(4, -1627965048, 3)
- ,(4, -1618716648, 1) ,(4, -1596429048, 3)
- ,(4, -1593829848, 5) ,(4, -1589860800, 4)
- ,(4, -1542427200, 5) ,(4, -1539493200, 6)
- ,(4, -1525323600, 5) ,(4, -1522728000, 4)
- ,(4, -1491188400, 7) ,(4, -1247536800, 4)
- ,(4, 354920409, 5) ,(4, 370728010, 4)
- ,(4, 386456410, 5) ,(4, 402264011, 4)
- ,(4, 417992411, 5) ,(4, 433800012, 4)
- ,(4, 449614812, 5) ,(4, 465346812, 8)
- ,(4, 481071612, 9) ,(4, 496796413, 8)
- ,(4, 512521213, 9) ,(4, 528246013, 8)
- ,(4, 543970813, 9) ,(4, 559695613, 8)
- ,(4, 575420414, 9) ,(4, 591145214, 8)
- ,(4, 606870014, 9) ,(4, 622594814, 8)
- ,(4, 638319615, 9) ,(4, 654649215, 8)
- ,(4, 670374016, 10) ,(4, 686102416, 11)
- ,(4, 695779216, 8) ,(4, 701812816, 5)
- ,(4, 717534017, 4) ,(4, 733273217, 9)
- ,(4, 748998018, 8) ,(4, 764722818, 9)
- ,(4, 780447619, 8) ,(4, 796172419, 9)
- ,(4, 811897219, 8) ,(4, 828226820, 9)
- ,(4, 846370820, 8) ,(4, 859676420, 9)
- ,(4, 877820421, 8) ,(4, 891126021, 9)
- ,(4, 909270021, 8) ,(4, 922575622, 9)
- ,(4, 941324422, 8) ,(4, 954025222, 9)
- ,(4, 972774022, 8) ,(4, 985474822, 9)
- ,(4, 1004223622, 8) ,(4, 1017529222, 9)
- ,(4, 1035673222, 8) ,(4, 1048978822, 9)
- ,(4, 1067122822, 8) ,(4, 1080428422, 9)
- ,(4, 1099177222, 8) ,(4, 1111878022, 9)
- ,(4, 1130626822, 8) ,(4, 1143327622, 9)
- ,(4, 1162076422, 8) ,(4, 1174777222, 9)
- ,(4, 1193526022, 8) ,(4, 1206831622, 9)
- ,(4, 1224975622, 8) ,(4, 1238281222, 9)
- ,(4, 1256425222, 8) ,(4, 1269730822, 9)
- ,(4, 1288479622, 8) ,(4, 1301180422, 9)
- ,(4, 1319929222, 8) ,(4, 1332630022, 9)
- ,(4, 1351378822, 8) ,(4, 1364684422, 9)
- ,(4, 1382828422, 8) ,(4, 1396134022, 9)
- ,(4, 1414278022, 8) ,(4, 1427583622, 9)
- ,(4, 1445727622, 8) ,(4, 1459033222, 9)
- ,(4, 1477782022, 8) ,(4, 1490482822, 9)
- ,(4, 1509231622, 8) ,(4, 1521932422, 9)
- ,(4, 1540681222, 8) ,(4, 1553986822, 9)
- ,(4, 1572130822, 8) ,(4, 1585436422, 9)
- ,(4, 1603580422, 8) ,(4, 1616886022, 9)
- ,(4, 1635634822, 8) ,(4, 1648335622, 9)
- ,(4, 1667084422, 8) ,(4, 1679785222, 9)
- ,(4, 1698534022, 8) ,(4, 1711839622, 9)
- ,(4, 1729983622, 8) ,(4, 1743289222, 9)
- ,(4, 1761433222, 8) ,(4, 1774738822, 9)
- ,(4, 1792882822, 8) ,(4, 1806188422, 9)
- ,(4, 1824937222, 8) ,(4, 1837638022, 9)
- ,(4, 1856386822, 8) ,(4, 1869087622, 9)
- ,(4, 1887836422, 8) ,(4, 1901142022, 9)
- ,(4, 1919286022, 8) ,(4, 1932591622, 9)
- ,(4, 1950735622, 8) ,(4, 1964041222, 9)
- ,(4, 1982790022, 8) ,(4, 1995490822, 9)
- ,(4, 2014239622, 8) ,(4, 2026940422, 9)
- ,(4, 2045689222, 8) ,(4, 2058390022, 9)
- ,(4, 2077138822, 8) ,(4, 2090444422, 9)
- ,(4, 2108588422, 8) ,(4, 2121894022, 9)
- ,(4, 2140038022, 8)
- ,(5, -1009875600, 1);
-
-
-CREATE TABLE time_zone_transition_type (
- Time_zone_id int unsigned NOT NULL,
- Transition_type_id int unsigned NOT NULL,
- Offset int signed DEFAULT 0 NOT NULL,
- Is_DST tinyint unsigned DEFAULT 0 NOT NULL,
- Abbreviation char(8) DEFAULT '' NOT NULL,
- PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='Time zone transition types';
-
-
-INSERT INTO time_zone_transition_type (
- Time_zone_id,Transition_type_id, Offset, Is_DST, Abbreviation) VALUES
- (1, 0, 7200, 1, 'MEST') ,(1, 1, 3600, 0, 'MET')
- ,(1, 2, 7200, 1, 'MEST') ,(1, 3, 3600, 0, 'MET')
- ,(2, 0, 0, 0, 'UTC')
- ,(3, 0, 9000, 0, 'MMT') ,(3, 1, 12648, 1, 'MST')
- ,(3, 2, 9048, 0, 'MMT') ,(3, 3, 16248, 1, 'MDST')
- ,(3, 4, 10800, 0, 'MSK') ,(3, 5, 14400, 1, 'MSD')
- ,(3, 6, 18000, 1, 'MSD') ,(3, 7, 7200, 0, 'EET')
- ,(3, 8, 10800, 0, 'MSK') ,(3, 9, 14400, 1, 'MSD')
- ,(3, 10, 10800, 1, 'EEST') ,(3, 11, 7200, 0, 'EET')
- ,(4, 0, 9000, 0, 'MMT') ,(4, 1, 12648, 1, 'MST')
- ,(4, 2, 9048, 0, 'MMT') ,(4, 3, 16248, 1, 'MDST')
- ,(4, 4, 10800, 0, 'MSK') ,(4, 5, 14400, 1, 'MSD')
- ,(4, 6, 18000, 1, 'MSD') ,(4, 7, 7200, 0, 'EET')
- ,(4, 8, 10800, 0, 'MSK') ,(4, 9, 14400, 1, 'MSD')
- ,(4, 10, 10800, 1, 'EEST') ,(4, 11, 7200, 0, 'EET')
- ,(5, 0, 32400, 0, 'CJT') ,(5, 1, 32400, 0, 'JST');
-
-
-CREATE TABLE time_zone_leap_second (
- Transition_time bigint signed NOT NULL,
- Correction int signed NOT NULL,
- PRIMARY KEY TranTime (Transition_time)
-) engine=MyISAM
-CHARACTER SET utf8
-comment='Leap seconds information for time zones';
-
-
-INSERT INTO time_zone_leap_second (
- Transition_time, Correction) VALUES
- (78796800, 1) ,(94694401, 2) ,(126230402, 3)
- ,(157766403, 4) ,(189302404, 5) ,(220924805, 6)
- ,(252460806, 7) ,(283996807, 8) ,(315532808, 9)
- ,(362793609, 10) ,(394329610, 11) ,(425865611, 12)
- ,(489024012, 13) ,(567993613, 14) ,(631152014, 15)
- ,(662688015, 16) ,(709948816, 17) ,(741484817, 18)
- ,(773020818, 19) ,(820454419, 20) ,(867715220, 21)
- ,(915148821, 22);
-
-
-CREATE TABLE procs_priv (
- Host char(60) binary DEFAULT '' NOT NULL,
- Db char(64) binary DEFAULT '' NOT NULL,
- User char(16) binary DEFAULT '' NOT NULL,
- Routine_name char(64) binary DEFAULT '' NOT NULL,
- Routine_type enum('FUNCTION','PROCEDURE') NOT NULL,
- Grantor char(77) DEFAULT '' NOT NULL,
- Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL,
- Timestamp timestamp(14),
- PRIMARY KEY (Host,Db,User,Routine_name,Routine_type),
- KEY Grantor (Grantor)
-) engine=MyISAM
-CHARACTER SET utf8 COLLATE utf8_bin
-comment='Procedure privileges';
-
-
-CREATE TABLE proc (
- db char(64) collate utf8_bin DEFAULT '' NOT NULL,
- name char(64) DEFAULT '' NOT NULL,
- type enum('FUNCTION','PROCEDURE') NOT NULL,
- specific_name char(64) DEFAULT '' NOT NULL,
- language enum('SQL') DEFAULT 'SQL' NOT NULL,
- sql_data_access enum('CONTAINS_SQL',
- 'NO_SQL',
- 'READS_SQL_DATA',
- 'MODIFIES_SQL_DATA'
- ) DEFAULT 'CONTAINS_SQL' NOT NULL,
- is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL,
- security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL,
- param_list blob DEFAULT '' NOT NULL,
- returns char(64) DEFAULT '' NOT NULL,
- body longblob DEFAULT '' NOT NULL,
- definer char(77) collate utf8_bin DEFAULT '' NOT NULL,
- created timestamp,
- modified timestamp,
- sql_mode set(
- 'REAL_AS_FLOAT',
- 'PIPES_AS_CONCAT',
- 'ANSI_QUOTES',
- 'IGNORE_SPACE',
- 'NOT_USED',
- 'ONLY_FULL_GROUP_BY',
- 'NO_UNSIGNED_SUBTRACTION',
- 'NO_DIR_IN_CREATE',
- 'POSTGRESQL',
- 'ORACLE',
- 'MSSQL',
- 'DB2',
- 'MAXDB',
- 'NO_KEY_OPTIONS',
- 'NO_TABLE_OPTIONS',
- 'NO_FIELD_OPTIONS',
- 'MYSQL323',
- 'MYSQL40',
- 'ANSI',
- 'NO_AUTO_VALUE_ON_ZERO',
- 'NO_BACKSLASH_ESCAPES',
- 'STRICT_TRANS_TABLES',
- 'STRICT_ALL_TABLES',
- 'NO_ZERO_IN_DATE',
- 'NO_ZERO_DATE',
- 'INVALID_DATES',
- 'ERROR_FOR_DIVISION_BY_ZERO',
- 'TRADITIONAL',
- 'NO_AUTO_CREATE_USER',
- 'HIGH_NOT_PRECEDENCE'
- ) DEFAULT '' NOT NULL,
- comment char(64) collate utf8_bin DEFAULT '' NOT NULL,
- PRIMARY KEY (db,name,type)
-) character set utf8 comment='Stored Procedures';
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index cefa1bae6d5..8920997b15d 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -299,6 +299,8 @@ our $path_ndb_examples_dir;
our $exe_ndb_example;
our $path_ndb_testrun_log;
+our $path_sql_dir;
+
our @data_dir_lst;
our $used_binlog_format;
@@ -1497,12 +1499,16 @@ sub executable_setup () {
$exe_mysql_fix_system_tables=
mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables",
"$path_client_bindir/mysql_fix_privilege_tables");
+
}
+ # Look for SQL scripts directory
+ $path_sql_dir= mtr_path_exists("$glob_basedir/share",
+ "$glob_basedir/scripts");
+
# Look for mysql_fix_privilege_tables.sql script
$file_mysql_fix_privilege_tables=
- mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",
- "$glob_basedir/share/mysql_fix_privilege_tables.sql");
+ mtr_file_exists("$path_sql_dir/mysql_fix_privilege_tables.sql");
if ( ! $opt_skip_ndbcluster and executable_setup_ndb())
{
@@ -1940,6 +1946,7 @@ sub environment_setup () {
"--port=$master->[0]->{'port'} " .
"--socket=$master->[0]->{'path_sock'}";
$ENV{'MYSQL_FIX_SYSTEM_TABLES'}= $cmdline_mysql_fix_system_tables;
+
}
$ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables;
@@ -2856,38 +2863,11 @@ sub install_db ($$) {
my $type= shift;
my $data_dir= shift;
- my $init_db_sql= "lib/init_db.sql";
- my $init_db_sql_tmp= "/tmp/init_db.sql$$";
- my $args;
-
mtr_report("Installing \u$type Database");
- open(IN, $init_db_sql)
- or mtr_error("Can't open $init_db_sql: $!");
- open(OUT, ">", $init_db_sql_tmp)
- or mtr_error("Can't write to $init_db_sql_tmp: $!");
- while (<IN>)
- {
- chomp;
- s/\@HOSTNAME\@/$glob_hostname/;
- if ( /^\s*$/ )
- {
- print OUT "\n";
- }
- elsif (/;$/)
- {
- print OUT "$_\n";
- }
- else
- {
- print OUT "$_ ";
- }
- }
- close OUT;
- close IN;
+ my $args;
mtr_init_args(\$args);
-
mtr_add_arg($args, "--no-defaults");
mtr_add_arg($args, "--bootstrap");
mtr_add_arg($args, "--basedir=%s", $path_my_basedir);
@@ -2921,21 +2901,44 @@ sub install_db ($$) {
# ----------------------------------------------------------------------
$ENV{'MYSQLD_BOOTSTRAP_CMD'}= "$exe_mysqld_bootstrap " . join(" ", @$args);
+ # ----------------------------------------------------------------------
+ # Create the bootstrap.sql file
+ # ----------------------------------------------------------------------
+ my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql$$";
+
+ # Use the mysql database for system tables
+ mtr_tofile($bootstrap_sql_file, "use mysql");
+
+ # Add the offical mysql system tables and initial system data
+ # for a prodcuction system
+ mtr_appendfile_to_file("$path_sql_dir/mysql_system_tables.sql",
+ $bootstrap_sql_file);
+
+ # Add test data for timezone - this is just a subset, on a real
+ # system these tables will be populated either by mysql_tzinfo_to_sql
+ # or by downloading the timezone table package from our website
+ mtr_appendfile_to_file("$path_sql_dir/mysql_test_data_timezone.sql",
+ $bootstrap_sql_file);
+
+ # Fill help tables, just an empty file when running from bk repo
+ # but will be replaced by a real fill_help_tables.sql when
+ # building the source dist
+ mtr_appendfile_to_file("$path_sql_dir/fill_help_tables.sql",
+ $bootstrap_sql_file);
+
# Log bootstrap command
my $path_bootstrap_log= "$opt_vardir/log/bootstrap.log";
mtr_tofile($path_bootstrap_log,
"$exe_mysqld_bootstrap " . join(" ", @$args) . "\n");
- if ( mtr_run($exe_mysqld_bootstrap, $args, $init_db_sql_tmp,
+ if ( mtr_run($exe_mysqld_bootstrap, $args, $bootstrap_sql_file,
$path_bootstrap_log, $path_bootstrap_log,
"", { append_log_file => 1 }) != 0 )
{
- unlink($init_db_sql_tmp);
mtr_error("Error executing mysqld --bootstrap\n" .
- "Could not install $type test DBs");
+ "Could not install system database, see $path_bootstrap_log");
}
- unlink($init_db_sql_tmp);
}
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 1dcbc693597..11c1431de7b 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -509,9 +509,11 @@ drop database mysqltest;
select database();
database()
NULL
+create user mysqltest_1;
select database(), user();
database() user()
NULL mysqltest_1@localhost
+drop user mysqltest_1;
use test;
create table t1 (a int, index `primary` (a));
ERROR 42000: Incorrect index name 'primary'
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index 8c7e39e0e90..3a098308b49 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@@ -202,6 +202,7 @@ drop table t1,t2;
SELECT a.x FROM (SELECT 1 AS x) AS a HAVING a.x = 1;
x
1
+create user mysqltest_1;
create table t1 select 1 as a;
select 2 as a from (select * from t1) b;
ERROR 3D000: No database selected
@@ -380,3 +381,4 @@ ID DATA FID
select t2.* from (select * from t1) as A inner join t2 on A.ID = t2.FID;
ID DATA FID
drop table t1, t2;
+drop user mysqltest_1;
diff --git a/mysql-test/r/join.result b/mysql-test/r/join.result
index f3114dc55dd..af2d4bed592 100644
--- a/mysql-test/r/join.result
+++ b/mysql-test/r/join.result
@@ -701,7 +701,7 @@ select * from information_schema.statistics join information_schema.columns
using(table_name,column_name) where table_name='user';
TABLE_NAME COLUMN_NAME TABLE_CATALOG TABLE_SCHEMA NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT TABLE_CATALOG TABLE_SCHEMA ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
user Host NULL mysql 0 mysql PRIMARY 1 A NULL NULL NULL BTREE NULL mysql 1 NO char 60 180 NULL NULL utf8 utf8_bin char(60) PRI #
-user User NULL mysql 0 mysql PRIMARY 2 A 5 NULL NULL BTREE NULL mysql 2 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI #
+user User NULL mysql 0 mysql PRIMARY 2 A 3 NULL NULL BTREE NULL mysql 2 NO char 16 48 NULL NULL utf8 utf8_bin char(16) PRI #
drop table t1;
drop table t2;
drop table t3;
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
index 1f93d727561..f92540a0d55 100644
--- a/mysql-test/r/mysql_upgrade.result
+++ b/mysql-test/r/mysql_upgrade.result
@@ -20,63 +20,43 @@ mysql.user OK
1
1
1
-1
-1
@hadShowDbPriv:=1
1
1
1
-1
-1
@hadCreateViewPriv:=1
1
1
1
-1
-1
@hadCreateRoutinePriv:=1
1
1
1
-1
-1
@hadCreateUserPriv:=1
1
1
1
-1
-1
Run it again - should say already completed
@hadGrantPriv:=1
1
1
1
-1
-1
@hadShowDbPriv:=1
1
1
1
-1
-1
@hadCreateViewPriv:=1
1
1
1
-1
-1
@hadCreateRoutinePriv:=1
1
1
1
-1
-1
@hadCreateUserPriv:=1
1
1
1
-1
-1
Force should run it regardless of wheter it's been run before
mysql.columns_priv OK
mysql.db OK
@@ -99,29 +79,19 @@ mysql.user OK
1
1
1
-1
-1
@hadShowDbPriv:=1
1
1
1
-1
-1
@hadCreateViewPriv:=1
1
1
1
-1
-1
@hadCreateRoutinePriv:=1
1
1
1
-1
-1
@hadCreateUserPriv:=1
1
1
1
-1
-1
diff --git a/mysql-test/r/sp-security.result b/mysql-test/r/sp-security.result
index 1198efc4f3b..26b3f352a1f 100644
--- a/mysql-test/r/sp-security.result
+++ b/mysql-test/r/sp-security.result
@@ -45,7 +45,7 @@ db1_secret
select * from db1_secret.t1;
ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
create procedure db1_secret.dummy() begin end;
-ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
+ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
drop procedure db1_secret.dummy;
ERROR 42000: PROCEDURE db1_secret.dummy does not exist
select * from t1;
@@ -76,9 +76,9 @@ ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
select db1_secret.db();
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
call db1_secret.stamp(6);
-ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
+ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
select db1_secret.db();
-ERROR 42000: Access denied for user ''@'localhost' to database 'db1_secret'
+ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
drop database if exists db2;
create database db2;
use db2;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index eef6ec85bfa..8e55bf62ba6 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -406,12 +406,14 @@ select database();
drop database mysqltest;
select database();
-# Connect without a database
+# Connect without a database as user mysqltest_1
+create user mysqltest_1;
connect (user1,localhost,mysqltest_1,,*NO-ONE*);
connection user1;
select database(), user();
connection default;
disconnect user1;
+drop user mysqltest_1;
use test;
#
diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test
index 3ad33dddcbe..4d8a8e3c3af 100644
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
@@ -99,7 +99,8 @@ SELECT a.x FROM (SELECT 1 AS x) AS a HAVING a.x = 1;
#
# Test for select if database is not selected.
#
-# Connect without a database
+# Connect without a database as user mysqltest_1
+create user mysqltest_1;
create table t1 select 1 as a;
connect (con1,localhost,mysqltest_1,,*NO-ONE*,$MASTER_MYPORT,$MASTER_MYSOCK);
connection con1;
@@ -271,4 +272,8 @@ select t2.* from ((select * from t1) as A inner join t2 on A.ID = t2.FID);
select t2.* from (select * from t1) as A inner join t2 on A.ID = t2.FID;
drop table t1, t2;
+disconnect con1;
+connection default;
+drop user mysqltest_1;
+
# End of 4.1 tests
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test
index 66128e56515..d08a9e3f83d 100644
--- a/mysql-test/t/grant2.test
+++ b/mysql-test/t/grant2.test
@@ -395,6 +395,8 @@ delete from mysql.user where user like 'mysqltest\_1';
flush privileges;
drop database mysqltest_1;
+--source include/add_anonymous_users.inc
+
# But anonymous users can't change their password
connect (n5,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
connection n5;
@@ -403,6 +405,8 @@ set password = password("changed");
disconnect n5;
connection default;
+--source include/delete_anonymous_users.inc
+
# Bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in
# multi-threaded environment". We should be able to execute FLUSH
diff --git a/mysql-test/t/grant_cache.test b/mysql-test/t/grant_cache.test
index 7e17a03ec21..c2e31621744 100644
--- a/mysql-test/t/grant_cache.test
+++ b/mysql-test/t/grant_cache.test
@@ -2,6 +2,8 @@
-- source include/not_embedded.inc
-- source include/have_query_cache.inc
+--source include/add_anonymous_users.inc
+
#
# Test grants with query cache
#
@@ -71,6 +73,7 @@ show status like "Qcache_queries_in_cache";
show status like "Qcache_hits";
show status like "Qcache_not_cached";
+
# Don't use '' as user because it will pick Unix login
connect (unkuser,localhost,unkuser,,,$MASTER_MYPORT,$MASTER_MYSOCK);
connection unkuser;
@@ -150,4 +153,7 @@ drop database mysqltest;
set GLOBAL query_cache_size=default;
+--source include/delete_anonymous_users.inc
+
+
# End of 4.1 tests
diff --git a/mysql-test/t/init_connect.test b/mysql-test/t/init_connect.test
index cf98f608982..c9a18a4003d 100644
--- a/mysql-test/t/init_connect.test
+++ b/mysql-test/t/init_connect.test
@@ -2,6 +2,8 @@
# Test of init_connect variable
#
+--source include/add_anonymous_users.inc
+
# should work with embedded server after mysqltest is fixed
-- source include/not_embedded.inc
connect (con0,localhost,root,,);
@@ -41,6 +43,8 @@ disconnect con3;
disconnect con4;
disconnect con5;
+--source include/delete_anonymous_users.inc
+
--echo End of 4.1 tests
#
# Test 5.* features
diff --git a/mysql-test/t/lock_multi.test b/mysql-test/t/lock_multi.test
index a279b715003..d670bb55a18 100644
--- a/mysql-test/t/lock_multi.test
+++ b/mysql-test/t/lock_multi.test
@@ -138,6 +138,10 @@ DROP DATABASE mysqltest_1;
#
# Bug#16986 - Deadlock condition with MyISAM tables
#
+
+# Need a matching user in mysql.user for multi-table select
+--source include/add_anonymous_users.inc
+
connection locker;
use mysql;
LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE;
@@ -214,6 +218,8 @@ UNLOCK TABLES;
connection default;
DROP TABLE t1;
+--source include/delete_anonymous_users.inc
+
#
# Bug #17264: MySQL Server freeze
#
diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test
index a1ceddcd183..8fda2ede948 100644
--- a/mysql-test/t/ndb_basic.test
+++ b/mysql-test/t/ndb_basic.test
@@ -583,8 +583,8 @@ drop table t1;
# Test auto_increment
#
-connect (con1,localhost,,,test);
-connect (con2,localhost,,,test);
+connect (con1,localhost,root,,test);
+connect (con2,localhost,root,,test);
create table t1
(counter int(64) NOT NULL auto_increment,
@@ -617,7 +617,7 @@ drop table t1;
#
# Bug #17249 delete statement with join where clause fails
# when table do not have pk
-#
+ #
create table t1 (a int) engine=ndb;
create table t2 (a int) engine=ndb;
diff --git a/mysql-test/t/ndb_index_ordered.test b/mysql-test/t/ndb_index_ordered.test
index 5867140fabb..19b024a043f 100644
--- a/mysql-test/t/ndb_index_ordered.test
+++ b/mysql-test/t/ndb_index_ordered.test
@@ -336,8 +336,8 @@ drop table t1;
# bug#7798
create table t1(a int primary key, b int not null, index(b));
insert into t1 values (1,1), (2,2);
-connect (con1,localhost,,,test);
-connect (con2,localhost,,,test);
+connect (con1,localhost,root,,test);
+connect (con2,localhost,root,,test);
connection con1;
set autocommit=0;
begin;
diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test
index 3bc735b60d4..97cce08fce0 100644
--- a/mysql-test/t/ndb_multi.test
+++ b/mysql-test/t/ndb_multi.test
@@ -19,8 +19,8 @@ select * from t2;
show status like 'handler_discover%';
# Check dropping and recreating table on same server
-connect (con1,localhost,,,test);
-connect (con2,localhost,,,test);
+connect (con1,localhost,root,,test);
+connect (con2,localhost,root,,test);
connection con1;
select * from t1;
connection con2;
diff --git a/mysql-test/t/overflow.test b/mysql-test/t/overflow.test
index c930707413b..a62ef9c4cd2 100644
--- a/mysql-test/t/overflow.test
+++ b/mysql-test/t/overflow.test
@@ -1,4 +1,4 @@
-connect (con1,localhost,boo,,);
+connect (con1,localhost,root,,);
connection con1;
-- error 1064,1102,1280
drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index 81f0e8a0af7..a05ec4fc714 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -1,3 +1,6 @@
+# Test need anonymous user when connection are made as "zedjzlcsjhd"
+source include/add_anonymous_users.inc;
+
source include/master-slave.inc;
# Clean up old slave's binlogs.
@@ -20,8 +23,8 @@ connection master;
connect (con1,localhost,root,,);
connect (con2,localhost,root,,);
# We want to connect as an unprivileged user. But if we use user="" then this
-# will pick the Unix login, which will cause problems if you're running the test
-# as root.
+# will pick the Unix login, which will cause problems if you're running the
+# test as root.
connect (con3,localhost,zedjzlcsjhd,,);
# We are going to use SET PSEUDO_THREAD_ID in this test;
@@ -201,4 +204,7 @@ select * from t1;
connection master;
drop table t1;
+# Delete the anonymous users
+source include/delete_anonymous_users.inc;
+
# End of 5.0 tests
diff --git a/mysql-test/t/xa.test b/mysql-test/t/xa.test
index 92405bac137..0d564727fe3 100644
--- a/mysql-test/t/xa.test
+++ b/mysql-test/t/xa.test
@@ -37,7 +37,7 @@ begin;
--error 1399
create table t2 (a int);
-connect (con1,localhost,,,);
+connect (con1,localhost,root,,);
connection con1;
--error 1440
View Lorry Controller Status