diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 20:52:47 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-01-28 20:52:47 +0100 |
| commit | c4f97d3cfa46a7f1b283926dd7fedb648566283f (patch) | |
| tree | d28e2ef33cd64ce35ce9a4cd92fdee720a9d5e82 /include | |
| parent | 8c2f3e0c16a4b9c2961a474f399b88be5ec330d1 (diff) | |
| parent | eff71f39ddc117d09da5465f7ea9fe007ed89009 (diff) | |
| download | mariadb-git-c4f97d3cfa46a7f1b283926dd7fedb648566283f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rw-r--r-- | include/mysql.h.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h index f088ad668a1..fc814787c22 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -283,7 +283,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 */ diff --git a/include/mysql.h.pp b/include/mysql.h.pp index a593f526c6e..f891ad6f2c9 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -354,7 +354,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; |