← Back to branch summary

~danielpvolpato/mysql-server/parallel-mysqldump

« back to all changes in this revision

Viewing changes to mysql-test/t/merge.test

Merge from main 5.1 to 5.1-build

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/t/merge.test
1201
1201
# Succeeds in embedded server - is converted to normal insert
1202
1202
# Fails in normal server, ps-protocol - not supported by engine
1203
1203
# Fails in normal server, normal protocol - not a base table
1204
 
--error 0, ER_ILLEGAL_HA, ER_WRONG_OBJECT
 
1204
--error 0, ER_DELAYED_NOT_SUPPORTED, ER_WRONG_OBJECT
1205
1205
INSERT DELAYED INTO t4 VALUES(44);
1206
1206
# Get rid of row in embedded server
1207
1207
DELETE FROM t4 WHERE c1 = 44;
1214
1214
  }
1215
1215
SELECT * FROM t4 ORDER BY c1;
1216
1216
LOCK TABLES t3 WRITE, t2 WRITE, t4 WRITE, t1 WRITE;
1217
 
--error ER_DELAYED_INSERT_TABLE_LOCKED, ER_ILLEGAL_HA
 
1217
--error ER_DELAYED_INSERT_TABLE_LOCKED, ER_DELAYED_NOT_SUPPORTED
1218
1218
INSERT DELAYED INTO t4 VALUES(444);
1219
 
--error ER_DELAYED_INSERT_TABLE_LOCKED, ER_ILLEGAL_HA
 
1219
--error ER_DELAYED_INSERT_TABLE_LOCKED, ER_DELAYED_NOT_SUPPORTED
1220
1220
INSERT DELAYED INTO t3 VALUES(333);
1221
1221
SELECT * FROM t4 ORDER BY c1;
1222
1222
UNLOCK TABLES;