From 99502158b7dca8bc5be4a52ecf30a671739a6b84 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 19 Feb 2006 09:41:59 -0800 Subject: Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). client/Makefile.am: Added threaded libary. client/mysqlimport.c: Updated logic to use threaded libmysql correctly. client/mysqlslap.c: Modified how threads were working. mysql-test/r/backup.result: Added deprecated messages. sql/sql_yacc.yy: Added deprecated messages to RESTORE, BACKUP, and LOAD TABLE FROM MASTER --- mysql-test/r/backup.result | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'mysql-test/r/backup.result') diff --git a/mysql-test/r/backup.result b/mysql-test/r/backup.result index 8c5d76565da..6322b03e38c 100644 --- a/mysql-test/r/backup.result +++ b/mysql-test/r/backup.result @@ -6,20 +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 1287 'BACKUP TABLE' is deprecated; use 'Command will be removed in next version.' 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 1287 'BACKUP TABLE' is deprecated; use 'Command will be removed in next version.' 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 1287 'BACKUP TABLE' is deprecated; use 'Command will be removed in next version.' 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 1287 'RESTORE TABLE' is deprecated; use 'Command will be removed in next version.' instead select count(*) from t4; count(*) 0 @@ -28,15 +34,20 @@ insert into t1 values (23),(45),(67); backup table t1 to '../tmp'; Table Op Msg_type Msg_text test.t1 backup status OK +Warnings: +Warning 1287 'BACKUP TABLE' is deprecated; use 'Command will be removed in next version.' instead drop table t1; restore table t1 from '../bogus'; Table Op Msg_type Msg_text t1 restore error Failed copying .frm file Warnings: +Warning 1287 'RESTORE TABLE' is deprecated; use 'Command will be removed in next version.' 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 1287 'RESTORE TABLE' is deprecated; use 'Command will be removed in next version.' instead select n from t1; n 23 @@ -50,12 +61,16 @@ backup table t2,t3 to '../tmp'; Table Op Msg_type Msg_text test.t2 backup status OK test.t3 backup status OK +Warnings: +Warning 1287 'BACKUP TABLE' is deprecated; use 'Command will be removed in next version.' instead drop table t1,t2,t3; restore table t1,t2,t3 from '../tmp'; Table Op Msg_type Msg_text test.t1 restore status OK test.t2 restore status OK test.t3 restore status OK +Warnings: +Warning 1287 'RESTORE TABLE' is deprecated; use 'Command will be removed in next version.' instead select n from t1; n 23 @@ -75,10 +90,14 @@ drop table t1,t2,t3,t4; restore table t1 from '../tmp'; Table Op Msg_type Msg_text test.t1 restore status OK +Warnings: +Warning 1287 'RESTORE TABLE' is deprecated; use 'Command will be removed in next version.' instead rename table t1 to t5; lock tables t5 write; backup table t5 to '../tmp'; unlock tables; Table Op Msg_type Msg_text test.t5 backup status OK +Warnings: +Warning 1287 'BACKUP TABLE' is deprecated; use 'Command will be removed in next version.' instead drop table t5; -- cgit v1.2.1