diff options
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.sh | 11 | ||||
| -rw-r--r-- | mysql-test/r/crypt.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/rpl000014.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/crypt.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl000014.test | 5 |
5 files changed, 13 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index de477f1420f..5fe578b05a6 100755 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -68,10 +68,6 @@ SLAVE_RUNNING=0 [ -d $MY_TMP_DIR ] || mkdir -p $MY_TMP_DIR -[ -z "$COLUMNS" ] && COLUMNS=80 -E=`expr $COLUMNS - 8` -DASH72=`expr substr '________________________________________________________________________' 1 $E` - #++ # mysqld Environment Parameters #-- @@ -113,6 +109,11 @@ TIME=/usr/bin/time TR=/usr/bin/tr XARGS=`which xargs | head -1` +[ -z "$COLUMNS" ] && COLUMNS=80 +E=`$EXPR $COLUMNS - 8` +#DASH72=`expr substr '________________________________________________________________________' 1 $E` +DASH72=`$ECHO '________________________________________________________________________'|$CUT -c 1-$E` + # on source dist, we pick up freshly build executables # on binary, use what is installed if [ x$SOURCE_DIST = x1 ] ; then @@ -469,7 +470,7 @@ run_testcase () fi timestr="$USERT $SYST $REALT" - pname=`$EXPR substr "$tname " 1 16` + pname=`$ECHO "$tname "|$CUT -c 1-16` $SETCOLOR_NORMAL && $ECHO -n "$pname $timestr" diff --git a/mysql-test/r/crypt.result b/mysql-test/r/crypt.result new file mode 100644 index 00000000000..fe3f80dc90d --- /dev/null +++ b/mysql-test/r/crypt.result @@ -0,0 +1,2 @@ +encrypt('foo', 'ff') +ffTU0fyIP09Z. diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result index 862d7b56bf2..25082dcc60f 100644 --- a/mysql-test/r/rpl000014.result +++ b/mysql-test/r/rpl000014.result @@ -1,7 +1,7 @@ File Position Binlog_do_db Binlog_ignore_db master-bin.001 73 Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db -127.0.0.1 root 9306 1 4 Yes +127.0.0.1 root 9306 1 73 Yes Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db 127.0.0.1 root 9306 1 73 No Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db diff --git a/mysql-test/t/crypt.test b/mysql-test/t/crypt.test new file mode 100644 index 00000000000..4a499f3d5b7 --- /dev/null +++ b/mysql-test/t/crypt.test @@ -0,0 +1 @@ +select encrypt('foo', 'ff'); diff --git a/mysql-test/t/rpl000014.test b/mysql-test/t/rpl000014.test index e47933b140a..200decf5201 100644 --- a/mysql-test/t/rpl000014.test +++ b/mysql-test/t/rpl000014.test @@ -2,9 +2,10 @@ source include/master-slave.inc; connection master; show master status; connection slave; +sleep 0.2; show slave status; change master to master_log_pos=73; -sleep 1; +sleep 0.2; slave stop; change master to master_log_pos=73; show slave status; @@ -19,5 +20,5 @@ create table foo (n int); insert into foo values (1),(2),(3); connection slave; change master to master_log_pos=73; -sleep 0.3; +sleep 0.2; select * from foo; |