diff options
author | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 13:16:03 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-04-20 14:33:24 +0200 |
commit | 587568b72a0f4bcb284b292f158dea6f65c03487 (patch) | |
tree | e9caae1f20e997ce2bc528fc41d1adbe2c2d8bf0 /sql/sp.cc | |
parent | bcb36ee21e2515d17dcf03b760487e64eb780f2b (diff) | |
parent | 51c415d97d60cad732d05c9d5516f7fa3fde1df9 (diff) | |
download | mariadb-git-587568b72a0f4bcb284b292f158dea6f65c03487.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sp.cc')
-rw-r--r-- | sql/sp.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 52d3c04cbdf..6d75f551357 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2002, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB + Copyright (c) 2002, 2018, Oracle and/or its affiliates. + Copyright (c) 2009, 2018, MariaDB 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 @@ -356,7 +356,7 @@ private: bool m_print_once; public: - Proc_table_intact() : m_print_once(TRUE) {} + Proc_table_intact() : m_print_once(TRUE) { has_keys= TRUE; } protected: void report_error(uint code, const char *fmt, ...); |