Commit d7307566 authored by unknown's avatar unknown
Browse files

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 

into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
parents 8b623739 6fd2a7bc

mysql-test/t/reserv/system_mysql_db_fix.test

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
#

# This is the test for mysql_fix_privilege_tables

#



-- disable_query_log

-- source include/create_old_system_tables.inc

-- exec $MYSQL_FIX_SYSTEM_TABLES --database=test > nil 2>nil

-- enable_query_log



-- source include/system_db_struct.inc



-- disable_query_log

-- source include/drop_system_tables.inc

-- enable_query_log

mysql-test/t/reserv/system_mysql_db.test→mysql-test/t/system_mysql_db.test

+8 −8

File changed and moved.

Contains only whitespace changes.

mysql-test/t/system_mysql_db_fix.test

0 → 100644
+78 −0
Original line number Diff line number Diff line 
#

# This is the test for mysql_fix_privilege_tables

#



-- disable_result_log

-- disable_query_log



use test;



# create system tables as in mysql-3.20



CREATE TABLE db (

  Host char(60) binary DEFAULT '' NOT NULL,

  Db char(32) 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,

  PRIMARY KEY Host (Host,Db,User),

  KEY User (User)

)

type=ISAM;

		      

INSERT INTO db VALUES ('%','test',   '','Y','Y','Y','Y','Y','Y');

INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y');

		      

CREATE TABLE host (

  Host char(60) binary DEFAULT '' NOT NULL,

  Db char(32) 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,

  PRIMARY KEY Host (Host,Db)

)

type=ISAM;

					

CREATE TABLE user (

  Host char(60) binary DEFAULT '' NOT NULL,

  User char(16) binary DEFAULT '' NOT NULL,

  Password char(16),

  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,

  PRIMARY KEY Host (Host,User)

)

type=ISAM;

								    

INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y');

INSERT INTO user VALUES ('localhost','',    '','N','N','N','N','N','N','N','N','N');



-- exec $MYSQL_FIX_SYSTEM_TABLES --database=test

-- enable_query_log

-- enable_result_log



-- source include/system_db_struct.inc



-- disable_query_log



DROP TABLE db;

DROP TABLE host;

DROP TABLE user;

DROP TABLE func;

DROP TABLE tables_priv;

DROP TABLE columns_priv;



-- enable_query_log

mysql-test/t/reserv/system_mysql_db_refs.test→mysql-test/t/system_mysql_db_refs.test

+90 −89
Original line number Diff line number Diff line
@@ -87,3 +87,4 @@ drop table test_func; 
drop table test_host;

drop table test_user;

drop table test_db;