diff options
author | unknown <msvensson@neptunus.(none)> | 2005-04-05 21:31:54 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-04-05 21:31:54 +0200 |
commit | 86fbe98343924426ff8c19be05b7faf7bf931cd5 (patch) | |
tree | a53dac0a11eb131a207d60b94d24d81edb11ef9f /mysql-test/t/ndb_alter_table.test | |
parent | d4cc076109d13e10be3327472eb7ef559df8a4c1 (diff) | |
parent | e897f10fb8159d3da2de1b273977ada31353bfd1 (diff) | |
download | mariadb-git-86fbe98343924426ff8c19be05b7faf7bf931cd5.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2156.1.5
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/ndb_alter_table.test')
-rw-r--r-- | mysql-test/t/ndb_alter_table.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test index 2edb358d386..6f0e51b7a4d 100644 --- a/mysql-test/t/ndb_alter_table.test +++ b/mysql-test/t/ndb_alter_table.test @@ -147,7 +147,7 @@ select * from t1 where b = 'two'; connection server1; alter table t1 drop index c; connection server2; ---error 1146 +--error 1105 select * from t1 where b = 'two'; select * from t1 where b = 'two'; connection server1; |