diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-03 17:22:05 +0200 |
| commit | a249e57b684a23dce4cbb870ca3eb30c77cb9fd6 (patch) | |
| tree | 9c50673311474f7efa0d5d110461ad324c7a62e6 /include/mysql.h.pp | |
| parent | 261ce5286f266f1a5fab5e8adc2c08adef658d13 (diff) | |
| parent | 955c7b32226c816b24a2ed1750e12bc0256565ad (diff) | |
| download | mariadb-git-a249e57b684a23dce4cbb870ca3eb30c77cb9fd6.tar.gz | |
Merge 10.1 into 10.2
Temporarily disable a test for
commit 2175bfce3e9da8332f10ab0e0286dc93915533a2
because fixing it in 10.2 requires updating libmariadb.
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 78947c972f9..73b9f9f588b 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -378,7 +378,7 @@ typedef struct st_mysql my_bool free_me; my_bool reconnect; char scramble[20 +1]; - my_bool unused1; + my_bool auto_local_infile; void *unused2, *unused3, *unused4, *unused5; LIST *stmts; const struct st_mysql_methods *methods; |