diff options
| author | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-05-31 20:17:31 +0200 |
|---|---|---|
| committer | unknown <mats@kindahl-laptop.dnsalias.net> | 2007-05-31 20:17:31 +0200 |
| commit | db0ce6ff6eb7c7dd16538fc8ce63e9ce8660000d (patch) | |
| tree | bbfe50d2fc0a5dc85adedfa669b350604759b382 /sql/share | |
| parent | 80af30efe10621b7c2b64f98cf957e0c1b5b5f8d (diff) | |
| parent | e9adcac2e8f663dbfda38ea917e00ca8af18440c (diff) | |
| download | mariadb-git-db0ce6ff6eb7c7dd16538fc8ce63e9ce8660000d.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl
sql/item_create.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_lex.h:
Manual merge.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index bb2d9c25a77..40744d0b07b 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6059,3 +6059,6 @@ ER_SLAVE_INCIDENT eng "The incident %s occured on the master. Message: %-.64s" ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT eng "Table has no partition for some existing values" +ER_BINLOG_UNSAFE_STATEMENT + eng "Statement is not safe to log in statement format." + swe "Detta är inte säkert att logga i statement-format." |