database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

References: MDEV-4572 - merge with mariaDB 5.5.30

Browse Source
This commit is contained in:
Seppo Jaakola
2013-05-24 15:29:01 +03:00
parent e95fdb74ab 421c885446
commit 48af4be62a
332 changed files with 8405 additions and 3554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@ -588,6 +588,9 @@ typedef struct system_variables
ulong wsrep_retry_autocommit;
#endif
double long_query_time_double;
my_bool pseudo_slave_mode;
} SV;
/**
@ -3320,6 +3323,7 @@ public:
#else
void begin_dataset() {}
#endif
virtual void update_used_tables() {}
};
@ -4059,6 +4063,7 @@ public:
return updated;
}
virtual void abort_result_set();
void update_used_tables();
};
class my_var : public Sql_alloc {
@ -4082,7 +4087,6 @@ public:
class select_dumpvar :public select_result_interceptor {
ha_rows row_count;
Item_func_set_user_var **set_var_items;
public:
List<my_var> var_list;
select_dumpvar() { var_list.empty(); row_count= 0;}