diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-04 09:05:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-04 09:05:45 +0300 |
| commit | b30fb701cc040cd9243a3634240672b27f78d142 (patch) | |
| tree | 2c181ef5c48a4622b0f8930418e905271777dff4 /sql | |
| parent | f6023857765701da780969b2628963738599865c (diff) | |
| parent | 71a2e6a3c66bc1e84809e0e91ffaef1cadc87642 (diff) | |
| download | mariadb-git-b30fb701cc040cd9243a3634240672b27f78d142.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.h | 1 | ||||
| -rw-r--r-- | sql/sql_class.h | 1 | ||||
| -rw-r--r-- | sql/sql_load.cc | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 487993b581f..41eb019bd6b 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1921,7 +1921,6 @@ class Item_func_set_user_var :public Item_func_user_var user variable it the first connection context). */ my_thread_id entry_thread_id; - char buffer[MAX_FIELD_WIDTH]; String value; my_decimal decimal_buff; bool null_item; diff --git a/sql/sql_class.h b/sql/sql_class.h index cb182f55bf1..2c5c01161b6 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4905,7 +4905,6 @@ class select_insert :public select_result_interceptor { class select_create: public select_insert { - ORDER *group; TABLE_LIST *create_table; Table_specification_st *create_info; TABLE_LIST *select_tables; diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 9006bf2b1d4..49558f8b694 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -167,7 +167,6 @@ class READ_INFO: public Load_data_param int enclosed_char,escape_char; int *stack,*stack_pos; bool found_end_of_line,start_of_line,eof; - NET *io_net; int level; /* for load xml */ bool getbyte(char *to) |