Merge 5.5-bug57604 into 5.5-bugteam

2d46b515 · Magnus Blåudd · b3f9f0c3 · 95ee8f4c · 2d46b515
Commit 2d46b515 authored Nov 24, 2010 by Magnus Blåudd
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

sql/sql_priv.h sql/sql_priv.h +6 -0

No files found.
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -144,6 +144,12 @@
 */
 #define OPTION_MASTER_SQL_ERROR (1ULL << 35)

+/*
+  Dont report errors for individual rows,
+  But just report error on commit (or read ofcourse)
+  Note! Reserved for use in MySQL Cluster
+*/
+#define OPTION_ALLOW_BATCH              (ULL(1) << 36) // THD, intern (slave)

 /* The rest of the file is included in the server only */
 #ifndef MYSQL_CLIENT