Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

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};