mirror of
https://github.com/MariaDB/server.git
synced 2025-05-29 21:42:28 +03:00
merged manually by guilhem. client/mysqlbinlog.cc: Post-merge fixes; manually merged by guilhem. include/mysqld_error.h: Post-merge fixes. mysql-test/r/drop_temp_table.result: Post-merge fixes. mysql-test/r/insert.result: Post-merge fixes. mysql-test/r/mysqlbinlog.result: Post-merge fixes. mysql-test/r/query_cache.result: Post-merge fixes. mysql-test/r/rpl_error_ignored_table.result: Post-merge fixes. mysql-test/r/rpl_relayrotate.result: Post-merge fixes. mysql-test/r/rpl_trunc_binlog.result: Post-merge fixes. mysql-test/r/sp-error.result: Post-merge fixes. mysql-test/r/sp.result: Post-merge fixes. mysql-test/r/system_mysql_db.result: Post-merge fixes. mysql-test/r/variables.result: Post-merge fixes. mysql-test/t/rpl_error_ignored_table.test: Post-merge fixes. mysql-test/t/sp-error.test: Post-merge fixes. sql/ha_innodb.cc: Post-merge fixes. sql/log_event.cc: Post-merge fixes; manually merged by guilhem. sql/set_var.cc: Post-merge fixes. sql/share/danish/errmsg.txt: Post-merge fixes. sql/share/dutch/errmsg.txt: Post-merge fixes. sql/share/english/errmsg.txt: Post-merge fixes. sql/share/estonian/errmsg.txt: Post-merge fixes. sql/sp.cc: Post-merge fixes. sql/sql_insert.cc: Post-merge fixes. sql/sql_table.cc: Post-merge fixes.
125 lines
6.0 KiB
Plaintext
125 lines
6.0 KiB
Plaintext
show tables;
|
|
Tables_in_db
|
|
columns_priv
|
|
db
|
|
func
|
|
help_category
|
|
help_keyword
|
|
help_relation
|
|
help_topic
|
|
host
|
|
proc
|
|
tables_priv
|
|
user
|
|
show create table db;
|
|
Table Create Table
|
|
db CREATE TABLE `db` (
|
|
`Host` char(60) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`User` char(16) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Select_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Insert_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Update_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Delete_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Create_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Drop_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Grant_priv` enum('N','Y') NOT NULL default 'N',
|
|
`References_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Index_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Alter_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Create_tmp_table_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Lock_tables_priv` enum('N','Y') NOT NULL default 'N',
|
|
PRIMARY KEY (`Host`,`Db`,`User`),
|
|
KEY `User` (`User`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Database privileges'
|
|
show create table host;
|
|
Table Create Table
|
|
host CREATE TABLE `host` (
|
|
`Host` char(60) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Select_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Insert_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Update_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Delete_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Create_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Drop_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Grant_priv` enum('N','Y') NOT NULL default 'N',
|
|
`References_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Index_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Alter_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Create_tmp_table_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Lock_tables_priv` enum('N','Y') NOT NULL default 'N',
|
|
PRIMARY KEY (`Host`,`Db`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Host privileges; Merged with database privileges'
|
|
show create table user;
|
|
Table Create Table
|
|
user CREATE TABLE `user` (
|
|
`Host` varchar(60) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`User` varchar(16) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Password` varchar(41) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Select_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Insert_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Update_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Delete_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Create_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Drop_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Reload_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Shutdown_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Process_priv` enum('N','Y') NOT NULL default 'N',
|
|
`File_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Grant_priv` enum('N','Y') NOT NULL default 'N',
|
|
`References_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Index_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Alter_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Show_db_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Super_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Create_tmp_table_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Lock_tables_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Execute_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Repl_slave_priv` enum('N','Y') NOT NULL default 'N',
|
|
`Repl_client_priv` enum('N','Y') NOT NULL default 'N',
|
|
`ssl_type` enum('','ANY','X509','SPECIFIED') 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',
|
|
PRIMARY KEY (`Host`,`User`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Users and global privileges'
|
|
show create table func;
|
|
Table Create Table
|
|
func CREATE TABLE `func` (
|
|
`name` char(64) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`ret` tinyint(1) NOT NULL default '0',
|
|
`dl` char(128) NOT NULL default '',
|
|
`type` enum('function','aggregate') NOT NULL default 'function',
|
|
PRIMARY KEY (`name`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='User defined functions'
|
|
show create table tables_priv;
|
|
Table Create Table
|
|
tables_priv CREATE TABLE `tables_priv` (
|
|
`Host` char(60) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`User` char(16) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Table_name` char(64) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Grantor` char(77) 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') NOT NULL default '',
|
|
`Column_priv` set('Select','Insert','Update','References') NOT NULL default '',
|
|
PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`),
|
|
KEY `Grantor` (`Grantor`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Table privileges'
|
|
show create table columns_priv;
|
|
Table Create Table
|
|
columns_priv CREATE TABLE `columns_priv` (
|
|
`Host` char(60) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Db` char(64) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`User` char(16) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Table_name` char(64) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Column_name` char(64) character set latin1 collate latin1_bin NOT NULL default '',
|
|
`Timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
|
|
`Column_priv` set('Select','Insert','Update','References') NOT NULL default '',
|
|
PRIMARY KEY (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Column privileges'
|