summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r--[-rwxr-xr-x]mysql-test/mysql-test-run.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 8ff75be324a..abc0452f3b1 100755..100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -3,6 +3,8 @@
# modified by Sasha Pachev <sasha@mysql.com>
# Sligtly updated by Monty
# Cleaned up again by Matt
+# Fixed by Sergei
+# :-)
#++
# Access Definitions
@@ -11,6 +13,7 @@ DB=test
DBUSER=test
DBPASSWD=
VERBOSE=""
+TZ=GMT-3; export TZ # for UNIX_TIMESTAMP tests to work
# Are we on source or binary distribution?
@@ -282,7 +285,7 @@ start_master()
--datadir=$MASTER_MYDDIR \
--pid-file=$MASTER_MYPID \
--socket=$MASTER_MYSOCK \
- --log=$MASTER_MYLOG \
+ --log=$MASTER_MYLOG --default-character-set=latin1 \
--language=english $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
if [ x$DO_DDD = x1 ]
then
@@ -323,7 +326,7 @@ start_slave()
--pid-file=$SLAVE_MYPID \
--port=$SLAVE_MYPORT \
--socket=$SLAVE_MYSOCK \
- --log=$SLAVE_MYLOG \
+ --log=$SLAVE_MYLOG --default-character-set=latin1 \
--language=english $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"
if [ x$DO_DDD = x1 ]
then