diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-04 08:29:08 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-04 08:29:08 +0300 |
| commit | 377fe08d00f158ecc7928ed382b22fc450cb5cb4 (patch) | |
| tree | d273a823d7f94fdea3e5775b8d8cd0b912812b0f /client | |
| parent | a2a9256f89707ce21ef3e0d7a20e6044e12c45c8 (diff) | |
| parent | 0155807367df9a12e9cdbf3c0b3fd1f0709e9f40 (diff) | |
| download | mariadb-git-377fe08d00f158ecc7928ed382b22fc450cb5cb4.tar.gz | |
merge with 4.0 to get last fixes to last merge
BitKeeper/etc/logging_ok:
auto-union
Docs/manual.texi:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
sql/hostname.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
merge with 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 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"); |