diff options
| author | unknown <aelkin@dl145j.mysql.com> | 2007-12-12 11:21:54 +0100 |
|---|---|---|
| committer | unknown <aelkin@dl145j.mysql.com> | 2007-12-12 11:21:54 +0100 |
| commit | 230f589f51ae1696443fffddd24f481d201fdef2 (patch) | |
| tree | 26a6be0967fa78ae52464242a4192ad14e512830 /sql/share | |
| parent | d27196b43bfad852175774bd8291a4c89b1ef6c9 (diff) | |
| parent | 96a51b7f39be9bd664a8d242670ad1d6522c2b83 (diff) | |
| download | mariadb-git-230f589f51ae1696443fffddd24f481d201fdef2.tar.gz | |
Merge elkin@aelkin2.mysql.internal:MySQL/TEAM/FIXES/5.1/bug31609-conflict_detection
into dl145j.mysql.com:/tmp/andrei/bug31552
mysql-test/extra/rpl_tests/rpl_row_basic.test:
Auto merged
mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_class.h:
Auto merged
sql/log_event.cc:
manual merge
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 02e20ad7c5c..dce1dd785bf 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6114,3 +6114,5 @@ ER_TRG_CANT_OPEN_TABLE ER_CANT_CREATE_SROUTINE eng "Cannot create stored routine `%-.64s`. Check warnings" +ER_SLAVE_AMBIGOUS_EXEC_MODE + eng "Ambiguous slave modes combination. %s" |