Merge 5.5-bug57604 into 5.5-bugteam

This commit is contained in:
Magnus Blåudd 2010-11-24 12:12:39 +01:00
commit 2d46b515a5

View file

@ -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