diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-06-26 11:37:48 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-06-26 11:37:48 -0700 |
| commit | 4a6a08309cd78091246a7fd598bc43cd25deba45 (patch) | |
| tree | 67d596918a2c844d7d873342caa754c39e526041 /sql/sql_class.h | |
| parent | 4ff6fd34dae6315384d8c38ea69092cde09b78ba (diff) | |
| parent | 072097174c8b91299fe74a3cd7c5248e6e3cfc57 (diff) | |
| download | mariadb-git-4a6a08309cd78091246a7fd598bc43cd25deba45.tar.gz | |
Merge 5.5 -> 5.5-mwl248.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 3147c35c9fd..630c9d9fe8c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. - Copyright (c) 2009-2012, Monty Program Ab + Copyright (c) 2000, 2012, Oracle and/or its affiliates. + Copyright (c) 2009, 2012, 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 @@ -482,6 +482,7 @@ typedef struct system_variables ulonglong group_concat_max_len; ha_rows select_limit; ha_rows max_join_size; + ha_rows expensive_subquery_limit; ulong auto_increment_increment, auto_increment_offset; ulong lock_wait_timeout; ulong join_cache_level; @@ -1548,6 +1549,8 @@ public: /* Used to execute base64 coded binlog events in MySQL server */ Relay_log_info* rli_fake; + /* Slave applier execution context */ + Relay_log_info* rli_slave; void reset_for_next_command(bool calculate_userstat); /* @@ -3523,7 +3526,8 @@ public: if (copy_field) /* Fix for Intel compiler */ { delete [] copy_field; - save_copy_field= copy_field= 0; + save_copy_field= copy_field= NULL; + save_copy_field_end= copy_field_end= NULL; } } }; |