diff options
author | unknown <gshchepa@devsrv-b.mysql.com> | 2007-09-14 17:21:50 +0200 |
---|---|---|
committer | unknown <gshchepa@devsrv-b.mysql.com> | 2007-09-14 17:21:50 +0200 |
commit | c0d75796cd0747c67be5f0085bf1b3841a1844a6 (patch) | |
tree | 12bfc904f1136f4cee471d6b995e8b29b2b1fa1f /mysql-test/r/events_trans.result | |
parent | 1d97c7484b981687394dc55412c5ed6e90968f98 (diff) | |
download | mariadb-git-c0d75796cd0747c67be5f0085bf1b3841a1844a6.tar.gz |
Many files:
Merge with 5.0-opt.
mysql-test/r/binlog_unsafe.result:
Merge with 5.0-opt.
mysql-test/r/events_bugs.result:
Merge with 5.0-opt.
mysql-test/r/events_trans.result:
Merge with 5.0-opt.
mysql-test/r/sp.result:
Merge with 5.0-opt.
mysql-test/r/sp_gis.result:
Merge with 5.0-opt.
mysql-test/r/xml.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_incident.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_udf.result:
Merge with 5.0-opt.
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_gis.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_row_format.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_single_user.result:
Merge with 5.0-opt.
Diffstat (limited to 'mysql-test/r/events_trans.result')
-rw-r--r-- | mysql-test/r/events_trans.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/events_trans.result b/mysql-test/r/events_trans.result index dce08d3b9f9..984e22a2c1a 100644 --- a/mysql-test/r/events_trans.result +++ b/mysql-test/r/events_trans.result @@ -63,7 +63,7 @@ begin work; insert into t1 (a) values ("OK: create event if not exists"); create event if not exists e1 on schedule every 2 day do select 2; Warnings: -Note 1535 Event 'e1' already exists +Note 1536 Event 'e1' already exists rollback work; select * from t1; a |