Commit 1363c9b2 authored by unknown's avatar unknown
Browse files

Fixed warning message breakage. 

Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references. 


mysql-test/r/backup.result:
  fix warnings
mysql-test/r/im_options.result:
  Remove missed bdb skip
mysql-test/r/im_utils.result:
  Remove missed bdb-skip
mysql-test/r/log_tables.result:
  Fix warnings
mysql-test/r/show_check.result:
  Fix warnings
mysql-test/r/sp_trans.result:
  Fix warning
mysql-test/r/type_timestamp.result:
  Fix warning
mysql-test/r/warnings.result:
  Fix warning
mysql-test/t/disabled.def:
  Disabled Federation test
mysql-test/t/federated_transactions.test:
  Fixed comments in federation test
netware/mysql_install_db.c:
  Fix install breakage.
netware/mysql_test_run.c:
  Fix install breakage.
scripts/mysql_install_db.sh:
  Fix install breakage
storage/myisam/ftbench/ft-test-run.sh:
  Fixed test which is never run
support-files/my-innodb-heavy-4G.cnf.sh:
  Modified examples
support-files/my-small.cnf.sh:
  Modified examples
parent 79072b50

mysql-test/r/backup.result

+11 −11
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	1541	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	1541	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	1541	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	1541	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	1541	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	1541	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	1541	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	1541	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	1541	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	1541	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,5 +99,5 @@ 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	1541	The syntax 'BACKUP TABLE' is deprecated and will be removed in MySQL 5.2. Please use MySQL Administrator (mysqldump, mysql) instead

drop table t5;

mysql-test/r/im_options.result

+0 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ character-sets-dir option_value 
basedir	option_value

skip-stack-trace	option_value

skip-innodb	option_value

skip-bdb	option_value

skip-ndbcluster	option_value

nonguarded	option_value

log-output	option_value
@@ -64,7 +63,6 @@ character-sets-dir option_value 
basedir	option_value

skip-stack-trace	option_value

skip-innodb	option_value

skip-bdb	option_value

skip-ndbcluster	option_value

nonguarded	option_value

log-output	option_value

mysql-test/r/im_utils.result

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ basedir VALUE 
server_id	VALUE

skip-stack-trace	VALUE

skip-innodb	VALUE

skip-bdb	VALUE

skip-ndbcluster	VALUE

log-output	VALUE

SHOW INSTANCE OPTIONS mysqld2;
@@ -38,7 +37,6 @@ basedir VALUE 
server_id	VALUE

skip-stack-trace	VALUE

skip-innodb	VALUE

skip-bdb	VALUE

skip-ndbcluster	VALUE

nonguarded	VALUE

log-output	VALUE

mysql-test/r/log_tables.result

+8 −8
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ on (mysql.general_log.command_type = join_test.command_type) 
drop table join_test;

flush logs;

lock tables mysql.general_log WRITE;

ERROR HY000: You can't write-lock a log table. Only read access is possible.

ERROR HY000: You can't write-lock a log table. Only read access is possible

lock tables mysql.slow_log WRITE;

ERROR HY000: You can't write-lock a log table. Only read access is possible.

ERROR HY000: You can't write-lock a log table. Only read access is possible

lock tables mysql.general_log READ;

ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead.

ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead

lock tables mysql.slow_log READ;

ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead.

ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead

lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;

unlock tables;

lock tables mysql.general_log READ LOCAL;
@@ -161,13 +161,13 @@ TIMESTAMP USER_HOST THREAD_ID 1 Query set global slow_query_log='ON' 
TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select * from mysql.general_log

flush logs;

lock tables mysql.general_log WRITE;

ERROR HY000: You can't write-lock a log table. Only read access is possible.

ERROR HY000: You can't write-lock a log table. Only read access is possible

lock tables mysql.slow_log WRITE;

ERROR HY000: You can't write-lock a log table. Only read access is possible.

ERROR HY000: You can't write-lock a log table. Only read access is possible

lock tables mysql.general_log READ;

ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead.

ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead

lock tables mysql.slow_log READ;

ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead.

ERROR HY000: You can't use usual read lock with log tables. Try READ LOCAL instead

lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;

unlock tables;

set global general_log='OFF';

mysql-test/r/show_check.result

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ drop database mysqltest; 
show full plugin;

show warnings;

Level	Code	Message

Warning	1541	The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW PLUGINS' instead.

Warning	1541	The syntax 'SHOW PLUGIN' is deprecated and will be removed in MySQL 5.2. Please use 'SHOW PLUGINS' instead

show plugin;

show plugins;

End of 5.1 tests