From ec061718af55d026496ade752dada3ff703c9453 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Oct 2006 00:36:03 +0200 Subject: [PATCH] Update result file Get server version from mysqld mysql-test/r/lock_multi.result: Update result format to latest version of mysqltest, remove leading scpace from query that has been "send" mysql-test/t/rpl_truncate_7ndb.test: get server version from mysqld --- mysql-test/r/lock_multi.result | 2 +- mysql-test/t/rpl_truncate_7ndb.test | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index 07b8bf78efd..2445b3e0c69 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -39,7 +39,7 @@ drop table t1; create table t1 (a int); create table t2 (a int); lock table t1 write, t2 write, t1 as t1_2 write, t2 as t2_2 write; - insert t1 select * from t2; +insert t1 select * from t2; drop table t2; ERROR 42S02: Table 'test.t2' doesn't exist drop table t1; diff --git a/mysql-test/t/rpl_truncate_7ndb.test b/mysql-test/t/rpl_truncate_7ndb.test index b0d4bdfc763..1d69eee5dd0 100644 --- a/mysql-test/t/rpl_truncate_7ndb.test +++ b/mysql-test/t/rpl_truncate_7ndb.test @@ -39,6 +39,7 @@ SELECT * FROM t1 ORDER BY a,b; --echo **** On Master **** connection master; DROP TABLE t1; +let SERVER_VERSION=`select version()`; --replace_regex /\/\* xid=[0-9]+ \*\//\/* xid= *\// /table_id: [0-9]+/table_id: #/ --replace_result $SERVER_VERSION SERVER_VERSION SHOW BINLOG EVENTS;