summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-04-03 21:35:51 +0400
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2010-04-03 21:35:51 +0400
commit3df8e88dd84e3bb6512e8c33498df5db4823d18a (patch)
tree4c53541bd85faea4f3fca21d63e1f8880d3c9189 /sql/sql_class.h
parent018b0d3ee7883da0a9ae294bb2d25b747f9e3a41 (diff)
parent0cb83d46e4fd678794ef4d487a10bec6e43688f0 (diff)
downloadmariadb-git-3df8e88dd84e3bb6512e8c33498df5db4823d18a.tar.gz
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts: Text conflict in mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result Text conflict in sql/log.cc Text conflict in sql/set_var.cc Text conflict in sql/sql_class.cc
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index de6d92eccfd..715239b0ff7 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1044,6 +1044,7 @@ public:
bool enable_slow_log;
bool last_insert_id_used;
SAVEPOINT *savepoints;
+ enum enum_check_fields count_cuted_fields;
};