summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-09-22 21:47:57 -0600
committerunknown <sasha@mysql.sashanet.com>2001-09-22 21:47:57 -0600
commit08b94f415bbce53a9bbc5a11330b7c8fadf92b81 (patch)
tree5842a4d7b8d3728781c758ff3c724c456c3be963 /mysql-test
parent8057a797a0cbef5bf59d37d0a8722a294b6e9f6a (diff)
downloadmariadb-git-08b94f415bbce53a9bbc5a11330b7c8fadf92b81.tar.gz
added mysqlmanager-pwgen
added set_exec_stdout and set_exec_stderr to mysqlmanager to be able to redirect stdout and stderr added support for MY_FULL_IO to my_read, so we can tell it to read a number of bytes in as many chunks as it takes instead of one try BitKeeper/etc/ignore: Added client/mysqlmanager-pwgen to the ignore list client/Makefile.am: mysqlmanager-pwgen client/mysqlmanagerc.c: clean-up include/my_sys.h: added MY_FULL_IO mysql-test/mysql-test-run.sh: started on changes to use mysqlmanager mysys/my_read.c: added support for MY_FULL_IO tools/managertest1.nc: updated test case tools/mysqlmanager.c: added set_exec_stdout and set_exec_stderr
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh31
1 files changed, 31 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 3a925372085..04b0b27cdb8 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -118,6 +118,7 @@ MASTER_RUNNING=0
MASTER_MYPORT=9306
SLAVE_RUNNING=0
SLAVE_MYPORT=9307
+MYSQL_MANAGER_PORT=23546
NO_SLAVE=0
EXTRA_MASTER_OPT=""
@@ -276,6 +277,9 @@ if [ x$SOURCE_DIST = x1 ] ; then
MYSQL_TEST="$BASEDIR/client/mysqltest"
fi
MYSQLADMIN="$BASEDIR/client/mysqladmin"
+ MYSQL_MANAGER_CLIENT="$BASEDIR/client/mysqlmanagerc"
+ MYSQL_MANAGER="$BASEDIR/tools/mysqlmanager"
+ MYSQL_MANAGER_PWGEN="$BASEDIR/client/mysqlmanager-pwgen"
MYSQL="$BASEDIR/client/mysql"
LANGUAGE="$BASEDIR/sql/share/english/"
CHARSETSDIR="$BASEDIR/sql/share/charsets"
@@ -284,6 +288,9 @@ else
MYSQLD="$BASEDIR/bin/mysqld"
MYSQL_TEST="$BASEDIR/bin/mysqltest"
MYSQLADMIN="$BASEDIR/bin/mysqladmin"
+ MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager"
+ MYSQL_MANAGER_CLIENT="$BASEDIR/bin/mysqlmanagerc"
+ MYSQL_MANAGER_PWGEN="$BASEDIR/bin/mysqlmanager-pwgen"
MYSQL="$BASEDIR/bin/mysql"
INSTALL_DB="./install_test_db -bin"
if test -d "$BASEDIR/share/mysql/english"
@@ -487,6 +494,30 @@ gcov_collect () {
$ECHO "gcov info in $GCOV_MSG, errors in $GCOV_ERR"
}
+abort_if_failed()
+{
+ if [ ! $? = 0 ] ; then
+ echo $1
+ exit 1
+ fi
+}
+
+start_manager()
+{
+ MYSQL_MANAGER_PW=`$MYSQL_MANAGER_PWGEN -o $MYSQL_MANAGER_PW_FILE`
+ $MYSQL_MANAGER --log=$MYSQL_MANAGER_LOG --port=$MYSQL_MANAGER_PORT \
+ --password-file=$MYSQL_MANAGER_PW_FILE
+ abort_if_failed "Could not start MySQL manager"
+}
+
+manager_cmd()
+{
+ $MYSQL_MANAGER_CLIENT --user=$MYSQL_MANAGER_USER \
+ --password=$MYSQL_MANAGER_PW --port=$MYSQL_MANAGER_PORT <<EOF
+$@
+EOF
+ abort_if_failed "Could not execute manager command"
+}
start_master()
{