diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 13:00:15 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-02 13:00:15 +0200 |
| commit | 213ece2f2e8c23ee0e727cc02dcecfae6f510ca2 (patch) | |
| tree | 5ce93ecb5caa9a58ebc08f8cd3e94c59d7219377 /include/mysql.h | |
| parent | c1e1764fc4b913ee688b383aac2698b83661d64c (diff) | |
| parent | d9d83f1d92b696ef56f4944df036b8a78364ebb4 (diff) | |
| download | mariadb-git-213ece2f2e8c23ee0e727cc02dcecfae6f510ca2.tar.gz | |
Merge 10.1 into 10.1
This is joint work with Oleksandr Byelkin.
Diffstat (limited to 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 53c86aee889..c538614c5ee 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -287,7 +287,7 @@ typedef struct st_mysql /* session-wide random string */ char scramble[SCRAMBLE_LENGTH+1]; - my_bool unused1; + my_bool auto_local_infile; void *unused2, *unused3, *unused4, *unused5; LIST *stmts; /* list of all statements */ |