database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 4.1 to 5.0

Browse Source
This commit is contained in:
pem@mysql.com
2003-12-01 16:14:40 +01:00
parent 82270288de f266cdabab
commit 6e717133c5
270 changed files with 4938 additions and 2632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_class.h
View File

@@ -619,7 +619,6 @@ public:
my_error(killed_errno(), MYF(0));
}
bool prepare_command;
bool tmp_table_used;
bool charset_is_system_charset, charset_is_collation_connection;
bool slow_command;
@@ -913,7 +912,12 @@ public:
class TMP_TABLE_PARAM :public Sql_alloc
{
public:
private:
/* Prevent use of these (not safe because of lists and copy_field) */
TMP_TABLE_PARAM(const TMP_TABLE_PARAM &);
void operator=(TMP_TABLE_PARAM &);
public:
List<Item> copy_funcs;
List<Item> save_copy_funcs;
List_iterator_fast<Item> copy_funcs_it;
@@ -938,6 +942,7 @@ class TMP_TABLE_PARAM :public Sql_alloc
{
cleanup();
}
void init(void);
inline void cleanup(void)
{
if (copy_field) /* Fix for Intel compiler */
@@ -963,6 +968,7 @@ class select_union :public select_result {
bool send_data(List<Item> &items);
bool send_eof();
bool flush();
void set_table(TABLE *tbl) { table= tbl; }
};
/* Base subselect interface class */