1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge mysql.com:/opt/local/work/mysql-4.1-16365

into  mysql.com:/opt/local/work/mysql-5.0-merge
This commit is contained in:
konstantin@mysql.com
2006-04-12 18:30:54 +04:00
10 changed files with 397 additions and 51 deletions

View File

@ -845,7 +845,7 @@ class Statement_map
public:
Statement_map();
int insert(Statement *statement);
int insert(THD *thd, Statement *statement);
Statement *find_by_name(LEX_STRING *name)
{
@ -883,20 +883,10 @@ public:
survive COMMIT or ROLLBACK. Currently all but MyISAM cursors are closed.
*/
void close_transient_cursors();
void erase(Statement *statement);
/* Erase all statements (calls Statement destructor) */
void reset()
{
my_hash_reset(&names_hash);
my_hash_reset(&st_hash);
transient_cursor_list.empty();
last_found_statement= 0;
}
void destroy()
{
hash_free(&names_hash);
hash_free(&st_hash);
}
void reset();
~Statement_map();
private:
HASH st_hash;
HASH names_hash;
@ -1373,6 +1363,7 @@ public:
{
my_bool my_bool_value;
long long_value;
ulong ulong_value;
} sys_var_tmp;
struct {