diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-12-02 17:52:22 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-12-02 17:52:22 +0200 |
| commit | 59dec1bcd20662f7a73d12c78b9b2e682a79e059 (patch) | |
| tree | 1342a5bdccc313accd5dfa8e27c487ddb0994720 /mysql-test/mysql-test-run.sh | |
| parent | 9fcbfc0d12444c19f5b51249425e9324516ee35a (diff) | |
| download | mariadb-git-59dec1bcd20662f7a73d12c78b9b2e682a79e059.tar.gz | |
Fixed bug when creating keys in temporary HEAP tables.
(This caused the DISTINCT test to fail)
Removed one inline as this caused compiler problems
heap/hp_create.c:
Comment
heap/hp_update.c:
Indentation cleanup
heap/hp_write.c:
Indentation cleanup
mysql-test/mysql-test-run.sh:
Better options for valgrind
sql/item_sum.cc:
Removed inline as this caused compiler problems with gcc 3.2
(Was also non standard usage of inline)
sql/item_sum.h:
Removed inline as this caused compiler problems with gcc 3.2
sql/sql_class.cc:
Fixed reference to uninitialized value
sql/sql_lex.cc:
Indentation cleanup
sql/sql_select.cc:
Fixed bug when creating keys in temporary HEAP tables.
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index d585243c6bc..745cde325f9 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -19,7 +19,7 @@ TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work # Program Definitions #-- -PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin:/usr/openwin/bin:/usr/bin/X11 +PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin:/usr/openwin/bin:/usr/bin/X11:$PATH MASTER_40_ARGS="--rpl-recovery-rank=1 --init-rpl-role=master" # Standard functions @@ -319,8 +319,8 @@ while test $# -gt 0; do VALGRIND="valgrind --alignment=8 --leak-check=yes" EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc" EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc" - SLEEP_TIME_AFTER_RESTART=120 - SLEEP_TIME_FOR_DELETE=120 + SLEEP_TIME_AFTER_RESTART=60 + SLEEP_TIME_FOR_DELETE=60 ;; --valgrind-options=*) TMP=`$ECHO "$1" | $SED -e "s;--valgrind-options=;;"` |