fixed BUG #2874 "Grant table bug" and

added tests for testing structure of mysql db


client/mysqltest.c:
  extend "replace" to column names
  extend "disable_result_log" to output of --exec commad
mysql-test/install_test_db.sh:
  corrected wrong column definitions (as a result of tests)
mysql-test/mysql-test-run.sh:
  export MYSQL and MYSQL_FIX_SYSTEM_TABLES + 
  added option --result-file for *.opt files
scripts/mysql_fix_privilege_tables.sh:
  added new options to using in tests + 
  added new alters (as a result of new tests)
scripts/mysql_fix_privilege_tables.sql:
  added new alters (as a result of new tests)
scripts/mysql_install_db.sh:
  corrected definition of tables_priv.Table_name

1 files changed, 119 insertions, 0 deletions

diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result
new file mode 100644
index 00000000000..257b3b13f08
--- /dev/null
+++ b/mysql-test/r/system_mysql_db.result
@@ -0,0 +1,119 @@
+show tables;
+Tables_in_db
+columns_priv
+db
+func
+host
+tables_priv
+user
+show create table db;
+Table	Create Table
+db	CREATE TABLE `db` (
+  `Host` char(60) binary NOT NULL default '',
+  `Db` char(64) binary NOT NULL default '',
+  `User` char(16) binary 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`)
+) TYPE=MyISAM COMMENT='Database privileges'
+show create table host;
+Table	Create Table
+host	CREATE TABLE `host` (
+  `Host` char(60) binary NOT NULL default '',
+  `Db` char(64) binary 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`)
+) TYPE=MyISAM COMMENT='Host privileges;  Merged with database privileges'
+show create table user;
+Table	Create Table
+user	CREATE TABLE `user` (
+  `Host` varchar(60) binary NOT NULL default '',
+  `User` varchar(16) binary NOT NULL default '',
+  `Password` varchar(16) binary 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`)
+) TYPE=MyISAM COMMENT='Users and global privileges'
+show create table func;
+Table	Create Table
+func	CREATE TABLE `func` (
+  `name` char(64) 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`)
+) TYPE=MyISAM COMMENT='User defined functions'
+show create table tables_priv;
+Table	Create Table
+tables_priv	CREATE TABLE `tables_priv` (
+  `Host` char(60) binary NOT NULL default '',
+  `Db` char(64) binary NOT NULL default '',
+  `User` char(16) binary NOT NULL default '',
+  `Table_name` char(64) binary NOT NULL default '',
+  `Grantor` char(77) NOT NULL default '',
+  `Timestamp` timestamp(14) NOT NULL,
+  `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`)
+) TYPE=MyISAM COMMENT='Table privileges'
+show create table columns_priv;
+Table	Create Table
+columns_priv	CREATE TABLE `columns_priv` (
+  `Host` char(60) binary NOT NULL default '',
+  `Db` char(64) binary NOT NULL default '',
+  `User` char(16) binary NOT NULL default '',
+  `Table_name` char(64) binary NOT NULL default '',
+  `Column_name` char(64) binary NOT NULL default '',
+  `Timestamp` timestamp(14) NOT NULL,
+  `Column_priv` set('Select','Insert','Update','References') NOT NULL default '',
+  PRIMARY KEY  (`Host`,`Db`,`User`,`Table_name`,`Column_name`)
+) TYPE=MyISAM COMMENT='Column privileges'