diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-09 03:53:35 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-09 03:53:35 +0300 |
| commit | 354882c8ce232770b2f3604cbcd5142aad6b002c (patch) | |
| tree | 7893a6d7541d528adc361f7fab05306a890040b0 /mysql-test/mysql-test-run.sh | |
| parent | 66cc095efb843a03e42696a6ff555bf40185747b (diff) | |
| parent | 4b39ab54a9d9d5250eb388e019f6eaaaf70fca38 (diff) | |
| download | mariadb-git-354882c8ce232770b2f3604cbcd5142aad6b002c.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 14e62d08b3f..e876eb2264d 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -128,6 +128,7 @@ DO_GDB="" DO_DDD="" DO_CLIENT_GDB="" SLEEP_TIME=2 +CHARACTER_SET=latin1_de DBUSER="" while test $# -gt 0; do @@ -277,6 +278,7 @@ if [ x$SOURCE_DIST = x1 ] ; then MYSQLADMIN="$BASEDIR/client/mysqladmin" MYSQL="$BASEDIR/client/mysql" LANGUAGE="$BASEDIR/sql/share/english/" + CHARSETSDIR="$BASEDIR/sql/share/charsets" INSTALL_DB="./install_test_db" else MYSQLD="$BASEDIR/bin/mysqld" @@ -287,8 +289,10 @@ else if test -d "$BASEDIR/share/mysql/english" then LANGUAGE="$BASEDIR/share/mysql/english/" + CHARSETSDIR="$BASEDIR/share/mysql/charsets" else LANGUAGE="$BASEDIR/share/english/" + CHARSETSDIR="$BASEDIR/share/charsets" fi fi @@ -506,7 +510,9 @@ start_master() --datadir=$MASTER_MYDDIR \ --pid-file=$MASTER_MYPID \ --socket=$MASTER_MYSOCK \ - --log=$MASTER_MYLOG --default-character-set=latin1 \ + --log=$MASTER_MYLOG \ + --character-sets-dir=$CHARSETSDIR \ + --default-character-set=$CHARACTER_SET \ --tmpdir=$MYSQL_TMP_DIR \ --language=$LANGUAGE \ --innodb_data_file_path=ibdata1:50M \ @@ -519,7 +525,8 @@ start_master() --datadir=$MASTER_MYDDIR \ --pid-file=$MASTER_MYPID \ --socket=$MASTER_MYSOCK \ - --default-character-set=latin1 \ + --character-sets-dir=$CHARSETSDIR \ + --default-character-set=$CHARACTER_SET \ --core \ --tmpdir=$MYSQL_TMP_DIR \ --language=$LANGUAGE \ @@ -575,7 +582,9 @@ start_slave() --pid-file=$SLAVE_MYPID \ --port=$SLAVE_MYPORT \ --socket=$SLAVE_MYSOCK \ - --log=$SLAVE_MYLOG --default-character-set=latin1 \ + --log=$SLAVE_MYLOG \ + --character-sets-dir=$CHARSETSDIR \ + --default-character-set=$CHARACTER_SET \ --core \ --tmpdir=$MYSQL_TMP_DIR \ --language=$LANGUAGE \ |