diff options
| author | monty@hundin.mysql.fi <> | 2002-06-04 00:41:32 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-04 00:41:32 +0300 |
| commit | 8cba72fe1f106049b14167898f8aea2a15519065 (patch) | |
| tree | bb3f74b5f4efc9dec5f5acee7826614acc00b887 /client | |
| parent | 490a40d64c27cf4e4169c58673ece44226aa9741 (diff) | |
| parent | 4b1836ee36635bc643ba6e3107fdbf916fffe967 (diff) | |
| download | mariadb-git-8cba72fe1f106049b14167898f8aea2a15519065.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 6 |
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"); |