summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2002-02-20 12:03:43 +0000
committerunknown <serg@serg.mysql.com>2002-02-20 12:03:43 +0000
commit52c955363a053ebf5800e5b6eedb34e697fc400e (patch)
treec048f9bdd321bb95a52264c12a1c5f89f283064f /include
parentffaefb41c3adfc5e579763077a3d64fac4c4ad97 (diff)
parent1635af0e0efd12490bd3da7b2c6d798171d66e59 (diff)
downloadmariadb-git-52c955363a053ebf5800e5b6eedb34e697fc400e.tar.gz
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
Diffstat (limited to 'include')
-rw-r--r--include/mysql.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h
index bd54be0bc22..0bd5b7092b8 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -143,7 +143,8 @@ struct st_mysql_options {
enum mysql_option { MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS,
MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND,
MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
- MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME};
+ MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME,
+ MYSQL_OPT_LOCAL_INFILE};
enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,
MYSQL_STATUS_USE_RESULT};