summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorRohit Kalhans <rohit.kalhans@oracle.com>2012-02-08 12:10:55 +0530
committerRohit Kalhans <rohit.kalhans@oracle.com>2012-02-08 12:10:55 +0530
commitb7430d73e4be2f5933e147ba7a44e3b054cb79b7 (patch)
treee58195a7225032197fd3df4e5727a459c791c2f8 /sql/share
parentde85a60049af7af2cfdaa6f642e4ea7b7189afbe (diff)
downloadmariadb-git-b7430d73e4be2f5933e147ba7a44e3b054cb79b7.tar.gz
Backout the patch for bug#11758263.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt8
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index d164f75d7d8..f5c96761da1 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -6486,11 +6486,3 @@ ER_PLUGIN_NO_UNINSTALL
ER_PLUGIN_NO_INSTALL
eng "Plugin '%s' is marked as not dynamically installable. You have to stop the server to install it."
-
-
-ER_BINLOG_UNSAFE_WRITE_AUTOINC_SELECT
- eng "Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave."
-
-ER_BINLOG_UNSAFE_CREATE_SELECT_AUTOINC
- eng "CREATE TABLE... SELECT... on a table with an auto-increment column is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are inserted. This order cannot be predicted and may differ on master and the slave."
-