Commit 7f33a414 authored by unknown's avatar unknown
Browse files

Merge monty@192.168.0.9:/home/my/mysql-5.1 

into  mysql.com:/home/my/mysql-5.1


mysql-test/r/create.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/rpl_skip_error-slave.opt:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
parents 4e024774 f7e838c5

mysql-test/extra/rpl_tests/rpl_trig004.test

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ delimiter ;// 


INSERT INTO test.t2 VALUES (1, 0.0);

# Expect duplicate error 1022 == ndb

--error 1022,error ER_DUP_ENTRY_WITH_KEY_NAME

--error 1022, ER_DUP_ENTRY_WITH_KEY_NAME

INSERT INTO test.t2 VALUES (1, 0.0);



#show binlog events;