diff options
| author | monty@mysql.com <> | 2005-02-03 13:18:30 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-02-03 13:18:30 +0200 |
| commit | 422c2eb868036e8741c4e6d62d7267930c4e69bd (patch) | |
| tree | e52c0cca0b1936bb8b6332b6f0e724b9666f65f1 /sql/sql_class.h | |
| parent | 12bf600d18b98a8d82167e21a2904ca40071dd75 (diff) | |
| parent | e7450d9781781666503837d748cf313e3f406f59 (diff) | |
| download | mariadb-git-422c2eb868036e8741c4e6d62d7267930c4e69bd.tar.gz | |
4.1 -> 5.0 merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 561cf099592..29185dfbf7b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -431,6 +431,11 @@ struct system_variables my_bool low_priority_updates; my_bool new_mode; my_bool query_cache_wlock_invalidate; +#ifdef HAVE_REPLICATION + ulong sync_replication; + ulong sync_replication_slave_id; + ulong sync_replication_timeout; +#endif /* HAVE_REPLICATION */ #ifdef HAVE_INNOBASE_DB my_bool innodb_table_locks; #endif /* HAVE_INNOBASE_DB */ @@ -1510,6 +1515,7 @@ public: select_max_min_finder_subselect(Item_subselect *item, bool mx) :select_subselect(item), cache(0), fmax(mx) {} + void cleanup(); bool send_data(List<Item> &items); bool cmp_real(); bool cmp_int(); |