diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 02:22:16 +0300 |
| commit | 2c6015e8dc962bef8f353af920581d9b6bd7fd82 (patch) | |
| tree | a19075577cf795c631e5ac514d6dac52880f9b86 /sql/sp_head.h | |
| parent | ca2b08e437d4c5538b40aa61fa44f68ddd74bc42 (diff) | |
| parent | 92630be0ee81604ec47cb8c7e9ab016e5449dc4d (diff) | |
| download | mariadb-git-2c6015e8dc962bef8f353af920581d9b6bd7fd82.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/sp_head.h')
| -rw-r--r-- | sql/sp_head.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.h b/sql/sp_head.h index bac97a1fd77..02269cf53a7 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -343,7 +343,7 @@ public: @todo Conflicting comment in sp_head.cc */ - void + bool restore_lex(THD *thd); /// Put the instruction on the backpatch list, associated with the label. |