diff options
| author | monty@hundin.mysql.fi <> | 2002-06-04 08:29:08 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-04 08:29:08 +0300 |
| commit | fc8490a111c7bd979e927c105e731a1c4881c0a8 (patch) | |
| tree | d273a823d7f94fdea3e5775b8d8cd0b912812b0f /client/mysqltest.c | |
| parent | ee6bd848804192d9bb4258ccf84b61b774190673 (diff) | |
| parent | 8cba72fe1f106049b14167898f8aea2a15519065 (diff) | |
| download | mariadb-git-fc8490a111c7bd979e927c105e731a1c4881c0a8.tar.gz | |
merge with 4.0 to get last fixes to last merge
Diffstat (limited to 'client/mysqltest.c')
| -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 b13f6b710eb..e9307bcdf60 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]) @@ -2356,6 +2358,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"); |