diff options
| author | unknown <mskold@mysql.com> | 2005-11-17 15:38:15 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-11-17 15:38:15 +0100 |
| commit | fe50343e1a4c5497bc2d4147497854b41e0b0bf9 (patch) | |
| tree | ab3361785f029ed64c6dc9db8e51241655ee4e92 /mysql-test/r/ndb_alter_table.result | |
| parent | 47044ea63b779ed6d89df35f5fb642b1a8191528 (diff) | |
| parent | a710414c87d08b27945ab8f22d273255f5a2ea64 (diff) | |
| download | mariadb-git-fe50343e1a4c5497bc2d4147497854b41e0b0bf9.tar.gz | |
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/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:
Merge
Diffstat (limited to 'mysql-test/r/ndb_alter_table.result')
| -rw-r--r-- | mysql-test/r/ndb_alter_table.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/ndb_alter_table.result b/mysql-test/r/ndb_alter_table.result index 69aa233b5e4..ae64a5f9d3f 100644 --- a/mysql-test/r/ndb_alter_table.result +++ b/mysql-test/r/ndb_alter_table.result @@ -179,8 +179,7 @@ a b c 2 two two alter table t1 drop index c; select * from t1 where b = 'two'; -a b c -2 two two +ERROR HY000: Table definition has changed, please retry transaction select * from t1 where b = 'two'; a b c 2 two two |