diff options
author | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-02-14 18:58:24 +0200 |
commit | 5fa6df3081eea58dbd21e24315e27d166e66d23c (patch) | |
tree | 9f6476af645cdeb53eefe6ca4f6bc6f4ac04bf84 /sql/mysql_priv.h | |
parent | 7bff1b0c345c6d8f334bd31f693fb9cbe69ea120 (diff) | |
parent | 3a231663f034394fe341ebc98fa335f824fa3135 (diff) | |
download | mariadb-git-5fa6df3081eea58dbd21e24315e27d166e66d23c.tar.gz |
merge with 3.23.49
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 03ec5ad9381..924f85b0a89 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -583,6 +583,7 @@ extern pthread_cond_t COND_refresh,COND_thread_count; extern pthread_attr_t connection_attrib; extern bool opt_endinfo, using_udf_functions, locked_in_memory, opt_using_transactions, use_temp_pool, mysql_embedded; +extern bool opt_local_infile; extern char f_fyllchar; extern ulong ha_read_count, ha_write_count, ha_delete_count, ha_update_count, ha_read_key_count, ha_read_next_count, ha_read_prev_count, |