1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Manual merge

mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
This commit is contained in:
unknown
2005-08-03 03:47:07 +00:00
20 changed files with 731 additions and 222 deletions

View File

@@ -2008,6 +2008,7 @@ void st_lex::cleanup_after_one_table_open()
time_zone_tables_used= 0;
if (sroutines.records)
my_hash_reset(&sroutines);
sroutines_list.empty();
}