summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-04 09:05:45 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-04 09:05:45 +0300
commitb30fb701cc040cd9243a3634240672b27f78d142 (patch)
tree2c181ef5c48a4622b0f8930418e905271777dff4 /sql/sql_load.cc
parentf6023857765701da780969b2628963738599865c (diff)
parent71a2e6a3c66bc1e84809e0e91ffaef1cadc87642 (diff)
downloadmariadb-git-b30fb701cc040cd9243a3634240672b27f78d142.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc1
1 files changed, 0 insertions, 1 deletions
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)