summaryrefslogtreecommitdiff
path: root/mysql-test/mysql_test_run_new.c
diff options
context:
space:
mode:
authorunknown <wax@kishkin.ru>2004-12-14 18:46:55 +0500
committerunknown <wax@kishkin.ru>2004-12-14 18:46:55 +0500
commit820d68d9033ed566177a4ff9c2c4c1e98b0deb6e (patch)
tree09a7b5e2571fc4f8e2de4cea9e832983faf5b711 /mysql-test/mysql_test_run_new.c
parenta88f6fda403e71d2f69736b8426b08b67e4c9c03 (diff)
downloadmariadb-git-820d68d9033ed566177a4ff9c2c4c1e98b0deb6e.tar.gz
corrected mysqltest.dsp
corrected mysql_test_run_new.dsp added dependency corrected path of mysql_test_run_new.dsp fixed wrong code added my_create_tables.c removed command_line fixed #elif restored NAME_MAX and MAX_FNAME added create_system_files() added compare() for windows added all files of testes in script added mysql-test in script BitKeeper/etc/ignore: Added mysql-4.1.8-win-src.zip to the ignore list VC++Files/client/mysqltest.dsp: corrected dsp file VC++Files/mysql-test/mysql_test_run_new.dsp: corrected mysql_test_run_new.dsp VC++Files/mysql.dsw: added dependency corrected path of mysql_test_run_new.dsp client/mysqltest.c: fixed wrong code mysql-test/Makefile.am: added my_create_tables.c mysql-test/my_manage.c: removed command_line fixed #elif mysql-test/my_manage.h: restored NAME_MAX and MAX_FNAME mysql-test/mysql_test_run_new.c: added create_system_files() added compare for windows scripts/make_win_src_distribution.sh: added all files of testes added mysql-test
Diffstat (limited to 'mysql-test/mysql_test_run_new.c')
-rw-r--r--mysql-test/mysql_test_run_new.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/mysql-test/mysql_test_run_new.c b/mysql-test/mysql_test_run_new.c
index d8bf731b398..fe13d71c1c2 100644
--- a/mysql-test/mysql_test_run_new.c
+++ b/mysql-test/mysql_test_run_new.c
@@ -267,6 +267,8 @@ void install_db(char *datadir)
snprintf(output, FN_REFLEN, "%s/install.out", datadir);
snprintf(error, FN_REFLEN, "%s/install.err", datadir);
+ if (create_system_files(datadir,input, TRUE))
+ die("Unable to create init_db.sql.");
/* args */
init_args(&al);
add_arg(&al, mysqld_file);
@@ -307,9 +309,6 @@ void mysql_install_db()
/* var directory */
snprintf(temp, FN_REFLEN, "%s/var", mysql_test_dir);
- /* clean up old direcotry */
- del_tree(temp);
-
/* create var directory */
#ifndef __WIN__
mkdir(temp, S_IRWXU);
@@ -1435,6 +1434,17 @@ void setup(char *file __attribute__((unused)))
}
+/*
+ Compare names of testes for right order
+*/
+#ifdef __WIN__
+int compare( const void *arg1, const void *arg2 )
+{
+ return _stricmp( * ( char** ) arg1, * ( char** ) arg2 );
+}
+#endif
+
+
/******************************************************************************
main()