diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-04-12 06:21:22 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-04-12 06:21:22 -0700 |
| commit | 0594dc66fb970f0fd528a77b486c4fbebf1a85d2 (patch) | |
| tree | e436ee65331f5a1500c3830ab700626d18fd5771 /sql/sql_priv.h | |
| parent | f3bbd40349dcb75c8a9c6fad88001463ab016211 (diff) | |
| parent | ff3407a111ec268e7bd5e726a75527089871c914 (diff) | |
| download | mariadb-git-0594dc66fb970f0fd528a77b486c4fbebf1a85d2.tar.gz | |
Merge 10.0-base->mwl253
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index d14ec5d0983..9891cf1b24e 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2010-2011 Monty Program Ab + Copyright (c) 2010, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -143,15 +143,15 @@ however, needs to rollback the effects of the succeeded statement to keep replication consistent. */ -#define OPTION_MASTER_SQL_ERROR (1ULL << 35) +#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) -#define OPTION_SKIP_REPLICATION (ULL(1) << 37) // THD, user +#define OPTION_ALLOW_BATCH (1ULL << 36) // THD, intern (slave) +#define OPTION_SKIP_REPLICATION (1ULL << 37) // THD, user /* Check how many bytes are available on buffer. |