diff options
| author | tonu@x153.internalnet <> | 2001-09-01 01:22:18 +0800 |
|---|---|---|
| committer | tonu@x153.internalnet <> | 2001-09-01 01:22:18 +0800 |
| commit | de70f2c6dfad2dfd61109ae81ee212004d1472ab (patch) | |
| tree | b3fe40b8b2d07d2ce41ae46bb8a92c51c0ece4cb /mysql-test | |
| parent | 9ded00c274ef2768393c96fd08e4ee1b6e17ff10 (diff) | |
| download | mariadb-git-de70f2c6dfad2dfd61109ae81ee212004d1472ab.tar.gz | |
OpenSSL testing added
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/install_test_db.sh | 14 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 9 |
2 files changed, 18 insertions, 5 deletions
diff --git a/mysql-test/install_test_db.sh b/mysql-test/install_test_db.sh index c661d94035c..0535b66e289 100644 --- a/mysql-test/install_test_db.sh +++ b/mysql-test/install_test_db.sh @@ -134,16 +134,20 @@ then c_u="$c_u References_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Index_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u ssl_type enum('none', 'cipher', 'x509','issuer','subject') NOT NULL," + c_u="$c_u ssl_cipher char(60) NULL," + c_u="$c_u x509_issuer blob NULL," + c_u="$c_u x509_subject blob NULL," c_u="$c_u PRIMARY KEY Host (Host,User)" c_u="$c_u )" c_u="$c_u comment='Users and global privileges';" - i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); - REPLACE INTO user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y'); + i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','none',NULL,NULL,NULL); + INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','none',NULL,NULL,NULL); + REPLACE INTO user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','none',NULL,NULL,NULL); - INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N'); - INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N');" + INSERT INTO user VALUES ('localhost','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','none',NULL,NULL,NULL); + INSERT INTO user VALUES ('$hostname','','','N','N','N','N','N','N','N','N','N','N','N','N','N','N','none',NULL,NULL,NULL);" fi if test ! -f $mdata/func.frm diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 4dad16b1e2a..f6053083cde 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -138,6 +138,15 @@ while test $# -gt 0; do --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; --master_port=*) MASTER_MYPORT=`$ECHO "$1" | $SED -e "s;--master_port=;;"` ;; --slave_port=*) SLAVE_MYPORT=`$ECHO "$1" | $SED -e "s;--slave_port=;;"` ;; + --with-openssl) + EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT \ + --ssl-ca=../SSL/cacert.pem \ + --ssl-cert=../SSL/server-cert.pem \ + --ssl-key=../SSL/server-key.pem" + EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT \ + --ssl-ca=../SSL/cacert.pem \ + --ssl-cert=../SSL/server-cert.pem \ + --ssl-key=../SSL/server-key.pem" ;; --skip-innobase) EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-innobase" EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-innobase" ;; |