Commit 076f5164 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1

parents 914afabd 9d839a14

mysql-test/lib/init_db.sql

+50 −50
Original line number Diff line number Diff line
@@ -4,18 +4,18 @@ 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,

  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,

  PRIMARY KEY Host (Host,Db,User),

  KEY User (User)

) engine=MyISAM
@@ -30,18 +30,18 @@ INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','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,

  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,

  PRIMARY KEY Host (Host,Db)

) engine=MyISAM

CHARACTER SET utf8 COLLATE utf8_bin
@@ -52,28 +52,28 @@ 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,

  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,

  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,
@@ -97,7 +97,7 @@ 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,

  type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL,

  PRIMARY KEY (name)

) engine=MyISAM

CHARACTER SET utf8 COLLATE utf8_bin
@@ -111,8 +111,8 @@ CREATE TABLE tables_priv ( 
  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,

  Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') 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
@@ -126,7 +126,7 @@ CREATE TABLE columns_priv ( 
  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,

  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