summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorJustin.He/justin.he@dev3-240.dev.cn.tlan <>2007-04-05 11:30:19 +0800
committerJustin.He/justin.he@dev3-240.dev.cn.tlan <>2007-04-05 11:30:19 +0800
commitc7da27b5b2d9d462bc9f35c8c40bf930c619a9dc (patch)
tree031cd24f0a6fdc5efc6c72a6f82b9d00edba3d2a /mysql-test
parent881fd5319c25aa71772ed020718f88183179b4a0 (diff)
parent98e5757618b6ff48c0284f86a08cac3b22db17dc (diff)
downloadmariadb-git-c7da27b5b2d9d462bc9f35c8c40bf930c619a9dc.tar.gz
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ndb_autodiscover.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_autodiscover.result b/mysql-test/r/ndb_autodiscover.result
index 6d1b7eb152d..01ea884a8ba 100644
--- a/mysql-test/r/ndb_autodiscover.result
+++ b/mysql-test/r/ndb_autodiscover.result
@@ -382,7 +382,7 @@ create table t1 (a int primary key) engine=ndb;
select * from t1;
a
select * from t1;
-ERROR HY000: Can't lock file (errno: 4009)
+ERROR HY000: Can't lock file (errno: 157)
use test;
drop database test_only_ndb_tables;
CREATE TABLE t9 (