diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-04 00:40:27 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-04 00:40:27 +0300 |
| commit | a7798dfd0a6472bf65fffc2ade543605e177ff9c (patch) | |
| tree | 675836bfd2d520dcffdb4499ac8cf51045c407f2 /client | |
| parent | 7cb2e2d1dce2c7466388f4a6ade0614564be82fc (diff) | |
| download | mariadb-git-a7798dfd0a6472bf65fffc2ade543605e177ff9c.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
Docs/manual.texi:
Changelog
client/mysqltest.c:
Enable LOAD DATA LOCAL INFILE
mysql-test/r/alter_table.result:
Test of syntax for column comments
mysql-test/r/func_math.result:
Fixed test of new truncate
mysql-test/t/alter_table.test:
Test of syntax for column comments
mysys/my_gethostbyname.c:
Portability fix
sql/hostname.cc:
Fixed pointer bug
sql/item_cmpfunc.cc:
Optimizing LIKE code
sql/item_cmpfunc.h:
Cleanup
sql/mysqld.cc:
Avoid warning of duplicate calls to mysql_thread_init()
sql/sql_analyse.cc:
Removed warning from DBUG
sql/sql_parse.cc:
Avoid warning of duplicate calls to mysql_thread_init()
sql/sql_table.cc:
Fix of ALTER TABLE RENAME
sql/sql_yacc.yy:
Added syntax for field comments
vio/test-sslserver.c:
Cleanup
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"); |