diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-06-14 20:05:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-06-14 20:05:31 +0200 |
| commit | 0522307ed1b4aeef16dd94606d0b0f6e974b29a5 (patch) | |
| tree | ac9829d5d4b0e676c984b931702282c446e604ea /sql/sql_class.h | |
| parent | d2ca6d2e7ff028f6abbab52e36530046b3f84a49 (diff) | |
| parent | 326b40c9c8160db414288925936449e55f4f3a0a (diff) | |
| download | mariadb-git-0522307ed1b4aeef16dd94606d0b0f6e974b29a5.tar.gz | |
mysql-5.5 merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index c88d8211986..1929be23086 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 @@ -1547,6 +1547,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); /* |