summaryrefslogtreecommitdiff
path: root/mysql-test/install_test_db.sh
diff options
context:
space:
mode:
authorunknown <tonu@x153.internalnet>2001-09-01 01:22:18 +0800
committerunknown <tonu@x153.internalnet>2001-09-01 01:22:18 +0800
commita485f382e5ae58c2c90a79ddc10bc1acaeb291e7 (patch)
treeb3fe40b8b2d07d2ce41ae46bb8a92c51c0ece4cb /mysql-test/install_test_db.sh
parent7a59325991bc32c65918175cf0a945bd9c0894a5 (diff)
downloadmariadb-git-a485f382e5ae58c2c90a79ddc10bc1acaeb291e7.tar.gz
OpenSSL testing added
Diffstat (limited to 'mysql-test/install_test_db.sh')
-rw-r--r--mysql-test/install_test_db.sh14
1 files changed, 9 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