diff options
| author | unknown <monty@mysql.com> | 2006-04-19 10:39:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-04-19 10:39:57 +0300 |
| commit | 31024b7c4abef37b119db56837c96fb203035948 (patch) | |
| tree | 6e7aa17c00ad66c8e61bb6acc3ee1bfed1688a95 /mysql-test/mysql-test-run.sh | |
| parent | db939c41bb77bbdfd92a8bbeef6fb8e1be08b0bf (diff) | |
| download | mariadb-git-31024b7c4abef37b119db56837c96fb203035948.tar.gz | |
Fix compilation failure when compiling with BUILD/compile-pentium-debug-max
(Problem with embedded server and ndb)
Fix broken mysql-test-run.sh
Removed memory leak in ha_example.cc
libmysqld/Makefile.am:
Fix compiler failure (libmysqld.a was empty)
Reason was that 'cd' did an echo that confused 'ar'
mysql-test/mysql-test-run.pl:
Make the port number in a nice range
mysql-test/mysql-test-run.sh:
Remove deprication message until speed of mysql-test-run.pl is comparable to mysql-test-run.sh
Fix code that jimw broke in his last change
storage/example/ha_example.cc:
Removed memory leak
(example_done_func was not called)
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index cb6fb0af0e8..aad71f89ef2 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -7,17 +7,11 @@ # List of failed cases (--force) backported from 4.1 by Joerg # :-) - -echo "##################################################"; -echo "This script is deprecated and will soon be removed"; -echo "Use mysql-test-run.pl instead"; -echo "Now sleeping 20 seconds..."; -echo "##################################################"; -sleep 20; -echo "continuing"; -echo; - - +#echo "##################################################"; +#echo "This script is deprecated and will soon be removed"; +#echo "Use mysql-test-run.pl instead"; +#echo "##################################################"; +#echo #++ # Access Definitions @@ -250,6 +244,7 @@ MASTER_MYPORT=9306 SLAVE_RUNNING=0 SLAVE_MYHOST=127.0.0.1 SLAVE_MYPORT=9308 # leave room for 2 masters for cluster tests +MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log NDBCLUSTER_PORT=9350 NDBCLUSTER_PORT_SLAVE=9358 @@ -1196,6 +1191,7 @@ abort_if_failed() launch_in_background() { + shift echo $@ | /bin/sh >> $CUR_MYERR 2>&1 & sleep 2 #hack return |