summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-06-04 00:40:27 +0300
committermonty@hundin.mysql.fi <>2002-06-04 00:40:27 +0300
commit4b1836ee36635bc643ba6e3107fdbf916fffe967 (patch)
tree675836bfd2d520dcffdb4499ac8cf51045c407f2 /client
parent544f95c45112993df1d31d3eda859dd5e4efff89 (diff)
downloadmariadb-git-4b1836ee36635bc643ba6e3107fdbf916fffe967.tar.gz
Enable LOAD DATA LOCAL INFILE in mysql_test
Added syntax for column comments (for compability with 4.1) Fix of ALTER TABLE RENAME
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 2421ae69af5..8fad182193b 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -42,7 +42,7 @@
**********************************************************************/
-#define MTEST_VERSION "1.23"
+#define MTEST_VERSION "1.24"
#include <my_global.h>
#include <mysql_embed.h>
@@ -1446,6 +1446,8 @@ int do_connect(struct st_query* q)
die("Failed on mysql_init()");
if (opt_compress)
mysql_options(&next_con->mysql,MYSQL_OPT_COMPRESS,NullS);
+ mysql_options(&next_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
+
if (con_sock && !free_con_sock && *con_sock && *con_sock != FN_LIBCHAR)
con_sock=fn_format(buff, con_sock, TMPDIR, "",0);
if (!con_db[0])
@@ -2355,6 +2357,8 @@ int main(int argc, char** argv)
die("Failed in mysql_init()");
if (opt_compress)
mysql_options(&cur_con->mysql,MYSQL_OPT_COMPRESS,NullS);
+ mysql_options(&cur_con->mysql, MYSQL_OPT_LOCAL_INFILE, 0);
+
cur_con->name = my_strdup("default", MYF(MY_WME));
if (!cur_con->name)
die("Out of memory");