Commit 6206af42 authored by unknown's avatar unknown
Browse files

WL #3031 

* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs


mysql-test/include/system_db_struct.inc:
  WL# 3031
  
  Added servers table to inc file used in system_mysql_db* tests
mysql-test/lib/init_db.sql:
  WL# 3031
  
  Added UTF charset to table def
mysql-test/r/mysql.result:
  WL# 3031
  
  New result files, new error messages shifted error #s up by two
mysql-test/r/rpl_sp.result:
  WL# 3031
  
  New result files, new error messages shifted error #s up by two
mysql-test/r/sp.result:
  WL# 3031
  
  New result files, new error messages shifted error #s up by two
mysql-test/r/sp_gis.result:
  WL# 3031
  
  New result files, new error messages shifted error #s up by two
mysql-test/r/system_mysql_db.result:
  WL #3031
  
  New system_mysql_db tests required adding servers table creation. Some more
  comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix30020.test:
  WL #3031
  
  New system_mysql_db tests required adding servers table creation. Some more
  comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix40123.test:
  WL #3031
  
  New system_mysql_db tests required adding servers table creation. Some more
  comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix50030.test:
  WL #3031
  
  New system_mysql_db tests required adding servers table creation. Some more
  comments in these tests would have been nice to explain what they do ;)
scripts/mysql_create_system_tables.sh:
  WL# 3031
  
  Added utf8 charset to table def
scripts/mysql_fix_privilege_tables.sql:
  WL# 3031
  
  Added servers table to mysql_fix_privilege_tables
parent c60024b0

mysql-test/include/system_db_struct.inc

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ show create table func; 
show create table tables_priv;

show create table columns_priv;

show create table procs_priv;

show create table servers;

show create table proc;

show create table event;

show create table general_log;

mysql-test/lib/init_db.sql

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ CREATE TABLE servers ( 
  Wrapper char(64) NOT NULL DEFAULT '',

  Owner char(64) NOT NULL DEFAULT '',

  PRIMARY KEY (Server_name))

  comment='MySQL Foreign Servers table';

  CHARACTER SET utf8 comment='MySQL Foreign Servers table';



INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','root');

mysql-test/r/mysql.result

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ ERROR 1049 (42000) at line 1: Unknown database 'invalid' 
ERROR 1049 (42000) at line 1: Unknown database 'invalid'

Test connect with dbname + hostname

Test connect with dbname + _invalid_ hostname

ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on 'invalid_hostname' (errno)

ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on 'invalid_hostname' (errno)

ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)

ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)

The commands reported in the bug report

ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)

Too long dbname

mysql-test/r/rpl_sp.result

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ end| 
ERROR HY000: You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)

set global log_bin_trust_routine_creators=1;

Warnings:

Warning	1541	The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead

Warning	1543	The syntax 'log_bin_trust_routine_creators' is deprecated and will be removed in MySQL 5.2. Please use 'log_bin_trust_function_creators' instead

set global log_bin_trust_function_creators=0;

set global log_bin_trust_function_creators=1;

set global log_bin_trust_function_creators=1;

mysql-test/r/sp.result

+4 −4
Original line number Diff line number Diff line
@@ -5633,7 +5633,7 @@ drop function if exists pi; 
create function pi() returns varchar(50)

return "pie, my favorite desert.";

Warnings:

Note	1580	This function 'pi' has the same name as a native function.

Note	1581	This function 'pi' has the same name as a native function.

SET @save_sql_mode=@@sql_mode;

SET SQL_MODE='IGNORE_SPACE';

select pi(), pi ();
@@ -5682,15 +5682,15 @@ use test; 
create function `database`() returns varchar(50)

return "Stored function database";

Warnings:

Note	1580	This function 'database' has the same name as a native function.

Note	1581	This function 'database' has the same name as a native function.

create function `current_user`() returns varchar(50)

return "Stored function current_user";

Warnings:

Note	1580	This function 'current_user' has the same name as a native function.

Note	1581	This function 'current_user' has the same name as a native function.

create function md5(x varchar(50)) returns varchar(50)

return "Stored function md5";

Warnings:

Note	1580	This function 'md5' has the same name as a native function.

Note	1581	This function 'md5' has the same name as a native function.

SET SQL_MODE='IGNORE_SPACE';

select database(), database ();

database()	database ()