diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-07-25 20:53:49 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-07-25 20:53:49 +0400 |
| commit | 2b0f6ece7bd35399de861f1dd5d1ae540ee89ff6 (patch) | |
| tree | 1e9216bd7901c2a09b12488bec3f6dae77416b78 /sql/sql_class.h | |
| parent | 0b79fe2b30e7a82a823e7c134eb69cfc0c078f95 (diff) | |
| parent | 55597a48698b267b966873727b079cd3ac0d1c18 (diff) | |
| download | mariadb-git-2b0f6ece7bd35399de861f1dd5d1ae540ee89ff6.tar.gz | |
Merge 5.5-main -> 5.5-show-explain
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 86797a8608b..3aefb3feee5 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; @@ -1552,6 +1553,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); /* @@ -3601,7 +3604,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; } } }; |