diff options
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index cc1caa91a73..814e0e6fa9a 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -184,7 +184,7 @@ typedef struct st_copy_info { ha_rows copied; ha_rows error; enum enum_duplicates handle_duplicates; - int escape_char; + int escape_char, errorno; } COPY_INFO; @@ -409,7 +409,7 @@ public: ha_rows select_limit,offset_limit,default_select_limit,cuted_fields, max_join_size, sent_row_count, examined_row_count; table_map used_tables; - UC *user_connect; + USER_CONN *user_connect; ulong query_id,version, inactive_timeout,options,thread_id; long dbug_thread_id; pthread_t real_id; @@ -693,6 +693,7 @@ class select_union :public select_result { TABLE *table; COPY_INFO info; uint save_time_stamp; + TMP_TABLE_PARAM *tmp_table_param; select_union(TABLE *table_par); ~select_union(); |