mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
2bcaed348d
This fixed a bug in prepared statements when used with outher joins Fixed a bug in SUM(DISTINCT) when used with prepared statements. Some safety fixes in test scripts to ensure that previous test failures shouldn't affect other tests mysql-test/r/mysqldump.result: Safety fix if a previous test would fail mysql-test/r/show_check.result: Safety fix if a previous test would fail mysql-test/r/sp.result: Fix for --ps-protocol mysql-test/r/synchronization.result: Safety fix if a previous test would fail mysql-test/r/system_mysql_db.result: Safety fix if a previous test would fail mysql-test/t/mysqldump.test: Safety fix if a previous test would fail mysql-test/t/select.test: Safety fix if a previous test would fail mysql-test/t/show_check.test: Safety fix if a previous test would fail mysql-test/t/sp.test: fix for --ps-protocol mysql-test/t/strict.test: Fix for --ps-protocol mysql-test/t/synchronization.test: Safety fix if a previous test would fail mysql-test/t/system_mysql_db.test: Safety fix if a previous test would fail sql/item_sum.cc: Fix bug in SUM(DISTINCT...) when using with prepared statements sql/item_sum.h: Fix bug in SUM(DISTINCT...) when using with prepared statements sql/mysql_priv.h: Better handling of ensuring that setup_tables() are not called twice sql/sql_base.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_insert.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_parse.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_prepare.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_select.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_union.cc: Better handling of ensuring that setup_tables() are not called twice sql/sql_update.cc: Better handling of ensuring that setup_tables() are not called twice sql/table.h: Better handling of ensuring that setup_tables() are not called twice
158 lines
8.3 KiB
Text
158 lines
8.3 KiB
Text
drop table if exists t1,t1aa,t2aa;
|
|
show tables;
|
|
Tables_in_db
|
|
columns_priv
|
|
db
|
|
func
|
|
help_category
|
|
help_keyword
|
|
help_relation
|
|
help_topic
|
|
host
|
|
proc
|
|
procs_priv
|
|
tables_priv
|
|
time_zone
|
|
time_zone_leap_second
|
|
time_zone_name
|
|
time_zone_transition
|
|
time_zone_transition_type
|
|
user
|
|
show create table db;
|
|
Table Create Table
|
|
db CREATE TABLE `db` (
|
|
`Host` char(60) collate utf8_bin NOT NULL default '',
|
|
`Db` char(64) collate utf8_bin NOT NULL default '',
|
|
`User` char(16) collate utf8_bin NOT NULL default '',
|
|
`Select_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Insert_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Update_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Delete_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Drop_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Grant_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`References_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Index_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Alter_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_tmp_table_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Lock_tables_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_view_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Show_view_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_routine_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Alter_routine_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Execute_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
PRIMARY KEY (`Host`,`Db`,`User`),
|
|
KEY `User` (`User`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Database privileges'
|
|
show create table host;
|
|
Table Create Table
|
|
host CREATE TABLE `host` (
|
|
`Host` char(60) collate utf8_bin NOT NULL default '',
|
|
`Db` char(64) collate utf8_bin NOT NULL default '',
|
|
`Select_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Insert_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Update_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Delete_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Drop_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Grant_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`References_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Index_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Alter_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_tmp_table_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Lock_tables_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_view_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Show_view_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
PRIMARY KEY (`Host`,`Db`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Host privileges; Merged with database privileges'
|
|
show create table user;
|
|
Table Create Table
|
|
user CREATE TABLE `user` (
|
|
`Host` char(60) collate utf8_bin NOT NULL default '',
|
|
`User` char(16) collate utf8_bin NOT NULL default '',
|
|
`Password` char(41) collate utf8_bin NOT NULL default '',
|
|
`Select_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Insert_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Update_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Delete_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Drop_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Reload_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Shutdown_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Process_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`File_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Grant_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`References_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Index_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Alter_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Show_db_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Super_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_tmp_table_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Lock_tables_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Execute_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Repl_slave_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Repl_client_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_view_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Show_view_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Create_routine_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`Alter_routine_priv` enum('N','Y') collate utf8_bin NOT NULL default 'N',
|
|
`ssl_type` enum('','ANY','X509','SPECIFIED') collate utf8_bin NOT NULL default '',
|
|
`ssl_cipher` blob NOT NULL,
|
|
`x509_issuer` blob NOT NULL,
|
|
`x509_subject` blob NOT NULL,
|
|
`max_questions` int(11) unsigned NOT NULL default '0',
|
|
`max_updates` int(11) unsigned NOT NULL default '0',
|
|
`max_connections` int(11) unsigned NOT NULL default '0',
|
|
`max_user_connections` int(11) unsigned NOT NULL default '0',
|
|
PRIMARY KEY (`Host`,`User`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
|
|
show create table func;
|
|
Table Create Table
|
|
func CREATE TABLE `func` (
|
|
`name` char(64) collate utf8_bin NOT NULL default '',
|
|
`ret` tinyint(1) NOT NULL default '0',
|
|
`dl` char(128) collate utf8_bin NOT NULL default '',
|
|
`type` enum('function','aggregate') collate utf8_bin NOT NULL default 'function',
|
|
PRIMARY KEY (`name`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='User defined functions'
|
|
show create table tables_priv;
|
|
Table Create Table
|
|
tables_priv CREATE TABLE `tables_priv` (
|
|
`Host` char(60) collate utf8_bin NOT NULL default '',
|
|
`Db` char(64) collate utf8_bin NOT NULL default '',
|
|
`User` char(16) collate utf8_bin NOT NULL default '',
|
|
`Table_name` char(64) collate utf8_bin NOT NULL default '',
|
|
`Grantor` char(77) collate utf8_bin NOT NULL default '',
|
|
`Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
|
|
`Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') collate utf8_bin NOT NULL default '',
|
|
`Column_priv` set('Select','Insert','Update','References') collate utf8_bin NOT NULL default '',
|
|
PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`),
|
|
KEY `Grantor` (`Grantor`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Table privileges'
|
|
show create table columns_priv;
|
|
Table Create Table
|
|
columns_priv CREATE TABLE `columns_priv` (
|
|
`Host` char(60) collate utf8_bin NOT NULL default '',
|
|
`Db` char(64) collate utf8_bin NOT NULL default '',
|
|
`User` char(16) collate utf8_bin NOT NULL default '',
|
|
`Table_name` char(64) collate utf8_bin NOT NULL default '',
|
|
`Column_name` char(64) collate utf8_bin NOT NULL default '',
|
|
`Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
|
|
`Column_priv` set('Select','Insert','Update','References') collate utf8_bin NOT NULL default '',
|
|
PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Column privileges'
|
|
show create table procs_priv;
|
|
Table Create Table
|
|
procs_priv CREATE TABLE `procs_priv` (
|
|
`Host` char(60) collate utf8_bin NOT NULL default '',
|
|
`Db` char(64) collate utf8_bin NOT NULL default '',
|
|
`User` char(16) collate utf8_bin NOT NULL default '',
|
|
`Routine_name` char(64) collate utf8_bin NOT NULL default '',
|
|
`Grantor` char(77) collate utf8_bin NOT NULL default '',
|
|
`Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
|
|
`Proc_priv` set('Execute','Alter Routine','Grant') collate utf8_bin NOT NULL default '',
|
|
PRIMARY KEY (`Host`,`Db`,`User`,`Routine_name`),
|
|
KEY `Grantor` (`Grantor`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Procedure privileges'
|
|
show tables;
|
|
Tables_in_test
|