Commit 00080b90 authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge


mysql-test/lib/init_db.sql:
  Auto merged
mysql-test/r/1st.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/mysqlcheck.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
mysql-test/r/sp.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
mysql-test/r/sp_gis.result:
  WL# 3031
  
  More fun with error codes. These error codes vary in the result files because new error codes have been added
parents 9e82f299 715e63ae

libmysqld/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
        event_queue.cc event_db_repository.cc \

	rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \

	sql_tablespace.cc \

	rpl_injector.cc my_user.c partition_info.cc

	rpl_injector.cc my_user.c partition_info.cc \

	sql_servers.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

libmysqld_a_SOURCES=

mysql-test/lib/init_db.sql

+14 −0
Original line number Diff line number Diff line
@@ -114,6 +114,20 @@ REPLACE INTO user VALUES ('127.0.0.1' ,'root','','Y','Y','Y','Y','Y','Y','Y','Y 
INSERT  INTO user (host,user) VALUES ('localhost','');

INSERT  INTO user (host,user) VALUES ('@HOSTNAME@%','');



CREATE TABLE servers (

  Server_name char(64) NOT NULL DEFAULT '',

  Host char(64) NOT NULL DEFAULT '',

  Db char(64) NOT NULL DEFAULT '',

  Username char(64) NOT NULL DEFAULT '',

  Password char(64) NOT NULL DEFAULT '',

  Port INT(4) NOT NULL DEFAULT '0',

  Socket char(64) NOT NULL DEFAULT '',

  Wrapper char(64) NOT NULL DEFAULT '',

  Owner char(64) NOT NULL DEFAULT '',

  PRIMARY KEY (Server_name))

  comment='MySQL Foreign Servers table';



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



CREATE TABLE func (

  name char(64) binary DEFAULT '' NOT NULL,

mysql-test/r/1st.result

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ ndb_binlog_index 
plugin

proc

procs_priv

servers

slow_log

tables_priv

time_zone

mysql-test/r/backup.result

+13 −13
Original line number Diff line number Diff line
@@ -6,26 +6,26 @@ Table Op Msg_type Msg_text 
test.t4	backup	error	Failed copying .frm file (errno: X)

test.t4	backup	status	Operation failed

Warnings:

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Error	1	Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)

backup table t4 to '../tmp';

Table	Op	Msg_type	Msg_text

test.t4	backup	status	OK

Warnings:

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

backup table t4 to '../tmp';

Table	Op	Msg_type	Msg_text

test.t4	backup	error	Failed copying .frm file (errno: X)

test.t4	backup	status	Operation failed

Warnings:

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Error	1	Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)

drop table t4;

restore table t4 from '../tmp';

Table	Op	Msg_type	Msg_text

test.t4	restore	status	OK

Warnings:

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

select count(*) from t4;

count(*)

0
@@ -35,19 +35,19 @@ backup table t1 to '../tmp'; 
Table	Op	Msg_type	Msg_text

test.t1	backup	status	OK

Warnings:

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

drop table t1;

restore table t1 from '../bogus';

Table	Op	Msg_type	Msg_text

t1	restore	error	Failed copying .frm file

Warnings:

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Error	29	File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X)

restore table t1 from '../tmp';

Table	Op	Msg_type	Msg_text

test.t1	restore	status	OK

Warnings:

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

select n from t1;

n

23
@@ -62,7 +62,7 @@ Table Op Msg_type Msg_text 
test.t2	backup	status	OK

test.t3	backup	status	OK

Warnings:

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

drop table t1,t2,t3;

restore table t1,t2,t3 from '../tmp';

Table	Op	Msg_type	Msg_text
@@ -70,7 +70,7 @@ test.t1 restore status OK 
test.t2	restore	status	OK

test.t3	restore	status	OK

Warnings:

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

select n from t1;

n

23
@@ -91,7 +91,7 @@ restore table t1 from '../tmp'; 
Table	Op	Msg_type	Msg_text

test.t1	restore	status	OK

Warnings:

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

rename table t1 to t5;

lock tables t5 write;

backup table t5 to '../tmp';
@@ -99,7 +99,7 @@ unlock tables; 
Table	Op	Msg_type	Msg_text

test.t5	backup	status	OK

Warnings:

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

drop table t5;

DROP TABLE IF EXISTS `t+1`;

CREATE  TABLE `t+1` (c1 INT);
@@ -108,13 +108,13 @@ BACKUP TABLE `t+1` TO '../tmp'; 
Table	Op	Msg_type	Msg_text

test.t+1	backup	status	OK

Warnings:

Warning	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

DROP    TABLE `t+1`;

RESTORE TABLE `t+1` FROM '../tmp';

Table	Op	Msg_type	Msg_text

test.t+1	restore	status	OK

Warnings:

Warning	1541	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

Warning	1543	The syntax 'RESTORE TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

SELECT * FROM `t+1`;

c1

1

mysql-test/r/connect.result

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ ndb_binlog_index 
plugin

proc

procs_priv

servers

slow_log

tables_priv

time_zone
@@ -47,6 +48,7 @@ ndb_binlog_index 
plugin

proc

procs_priv

servers

slow_log

tables_priv

time_zone
@@ -87,6 +89,7 @@ ndb_binlog_index 
plugin

proc

procs_priv

servers

slow_log

tables_priv

time_zone