diff options
| -rwxr-xr-x | BUILD/compile-pentium-valgrind-max | 2 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 9 | ||||
| -rw-r--r-- | sql/time.cc | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/BUILD/compile-pentium-valgrind-max b/BUILD/compile-pentium-valgrind-max index d0e25fa2f40..2e739ce9607 100755 --- a/BUILD/compile-pentium-valgrind-max +++ b/BUILD/compile-pentium-valgrind-max @@ -14,7 +14,7 @@ extra_configs="$extra_configs --with-berkeley-db --with-innodb --without-isam -- if test -z "$just_print" then - set +v + set +v +x echo "\ ****************************************************************************** Note that by default BUILD/compile-pentium-valgrind-max calls 'configure' with diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 8af3a3ac3ec..46d6819b819 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -337,7 +337,7 @@ while test $# -gt 0; do EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --gdb" EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --gdb" ;; - --valgrind) + --valgrind | --valgrind-all) VALGRIND=`which valgrind` # this will print an error if not found # Give good warning to the user and stop if [ -z "$VALGRIND" ] ; then @@ -350,14 +350,15 @@ while test $# -gt 0; do SLEEP_TIME_AFTER_RESTART=10 SLEEP_TIME_FOR_DELETE=60 USE_RUNNING_SERVER="" + if test "$1" = "--valgrind-all" + then + VALGRIND="$VALGRIND -v --show-reachable=yes" + fi ;; --valgrind-options=*) TMP=`$ECHO "$1" | $SED -e "s;--valgrind-options=;;"` VALGRIND="$VALGRIND $TMP" ;; - --valgrind-all) - VALGRIND="$VALGRIND -v --show-reachable=yes" - ;; --skip-*) EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $1" EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT $1" diff --git a/sql/time.cc b/sql/time.cc index 3fa00fc683b..e696918dee3 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -779,7 +779,8 @@ fractional: current_thd->cuted_fields++; return 1; } - l_time->month=0; + l_time->year= 0; // For protocol::store_time + l_time->month= 0; l_time->day= date[0]; l_time->hour= date[1]; l_time->minute= date[2]; |