diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
| commit | 4bf849c23c2fe2174016da630705a362f76d3922 (patch) | |
| tree | f39b89f218ff81ceb62349eb225a455d52c3ba78 /sql/sql_class.h | |
| parent | f04cf03f75ffca0b99562c027c1c57340d375f66 (diff) | |
| parent | 62db6839b82d824567979ef3e05caccd67ed11ec (diff) | |
| download | mariadb-git-4bf849c23c2fe2174016da630705a362f76d3922.tar.gz | |
Merge MySQL 5.1.44 into MariaDB.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index dc19f3d24ba..841acae0bf8 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -359,6 +359,7 @@ struct system_variables ulong ndb_index_stat_cache_entries; ulong ndb_index_stat_update_freq; ulong binlog_format; // binlog format for this thd (see enum_binlog_format) + my_bool binlog_direct_non_trans_update; /* In slave thread we need to know in behalf of which thread the query is being run to replicate temp tables properly @@ -558,6 +559,8 @@ public: { return state == INITIALIZED_FOR_SP; } inline bool is_stmt_prepare_or_first_sp_execute() const { return (int)state < (int)PREPARED; } + inline bool is_stmt_prepare_or_first_stmt_execute() const + { return (int)state <= (int)PREPARED; } inline bool is_first_stmt_execute() const { return state == PREPARED; } inline bool is_stmt_execute() const { return state == PREPARED || state == EXECUTED; } @@ -2636,7 +2639,7 @@ public: {} int prepare(List<Item> &list, SELECT_LEX_UNIT *u); - void binlog_show_create_table(TABLE **tables, uint count); + int binlog_show_create_table(TABLE **tables, uint count); void store_values(List<Item> &values); void send_error(uint errcode,const char *err); bool send_eof(); |