diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-04 14:12:30 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-04 14:12:30 +0100 |
| commit | a7b2a1ff99017e2bbcbdc2f9c365ac4775db9626 (patch) | |
| tree | 97c30ad91231a3a55cd33428ee920bbea5ef32a5 /client/mysqltest.cc | |
| parent | f34c7dca0271bced14858c9369cebe2459ff9278 (diff) | |
| parent | f37f38006b2d8e73300bf4204b16370892178a46 (diff) | |
| download | mariadb-git-a7b2a1ff99017e2bbcbdc2f9c365ac4775db9626.tar.gz | |
merge from mysql-next-mr
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index ccc2a32d8cd..d3181fea522 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -2227,7 +2227,7 @@ do_result_format_version(struct st_command *command) long version; static DYNAMIC_STRING ds_version; const struct command_arg result_format_args[] = { - "version", ARG_STRING, TRUE, &ds_version, "Version to use", + {"version", ARG_STRING, TRUE, &ds_version, "Version to use"} }; DBUG_ENTER("do_result_format_version"); @@ -6163,6 +6163,8 @@ void init_win_path_patterns() "$MYSQL_TMP_DIR", "$MYSQLTEST_VARDIR", "$MASTER_MYSOCK", + "$MYSQL_SHAREDIR", + "$MYSQL_LIBDIR", "./test/" }; int num_paths= sizeof(paths)/sizeof(char*); int i; @@ -7111,7 +7113,7 @@ int util_query(MYSQL* org_mysql, const char* query){ cur_con->util_mysql= mysql; } - return mysql_query(mysql, query); + DBUG_RETURN(mysql_query(mysql, query)); } @@ -7749,6 +7751,7 @@ int main(int argc, char **argv) cur_file->file_name= my_strdup("<stdin>", MYF(MY_WME)); cur_file->lineno= 1; } + var_set_string("MYSQLTEST_FILE", cur_file->file_name); init_re(); ps_protocol_enabled= ps_protocol; sp_protocol_enabled= sp_protocol; |