summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authormats@kindahl-laptop.dnsalias.net <>2007-05-28 12:50:29 +0200
committermats@kindahl-laptop.dnsalias.net <>2007-05-28 12:50:29 +0200
commit9a92325c02c55d2b60f44ca3e8724787b8d2d100 (patch)
tree5f33520a3ea4809926952b015e31af3977e1e805 /sql/share
parent6a7925a262bbe4ab37a90a952330b3b411bc2df5 (diff)
downloadmariadb-git-9a92325c02c55d2b60f44ca3e8724787b8d2d100.tar.gz
WL#3303 (RBR: Engine-controlled logging format):
Adding support to allow engines to tell what formats they can handle. The server will generate an error if it is not possible to log the statement according to the logging mode in effect. Adding flags to several storage engines to state what they can handle. Changes to NDB handler removing code that forces row-based mode and adding flag saying that NDB can only handle row format. Adding check that binlog flags are only used for real tables that are opened for writing.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 2e1240ab616..675ef5bc7b0 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -6062,3 +6062,9 @@ ER_NO_PARTITION_FOR_GIVEN_VALUE_SILENT
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."
+ER_BINLOG_ENGINES_INCOMPATIBLE
+ eng "It is not possible to log anything with this combination of engines"
+ER_BINLOG_STMT_FORMAT_FORBIDDEN
+ eng "Attempting to log statement in in statement format, but statement format is not possible with this combination of engines"
+ER_BINLOG_ROW_FORMAT_FORBIDDEN
+ eng "Attempting to log statement in in row format, but row format is not possible with this combination of engines"