summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorpeter@mysql.com <>2002-11-24 17:07:53 +0300
committerpeter@mysql.com <>2002-11-24 17:07:53 +0300
commit35ccfd0b4271336049e06e130fbfa1086ba51945 (patch)
treedb7cb82e2166048d043214a331a5ad63bc7d0621 /scripts
parent961317599eb1ca18547e2a6fa6c1174c6e546ab8 (diff)
downloadmariadb-git-35ccfd0b4271336049e06e130fbfa1086ba51945.tar.gz
SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit
done for merge with newer version of code.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_fix_privilege_tables.sh1
-rw-r--r--scripts/mysql_install_db.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index 247e3399b8b..a65aca3c1fc 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/scripts/mysql_fix_privilege_tables.sh
@@ -170,6 +170,7 @@ fi
@bindir@/mysql -f --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA
alter table user
+change password password char(45) not null,
add max_questions int(11) NOT NULL AFTER x509_subject,
add max_updates int(11) unsigned NOT NULL AFTER max_questions,
add max_connections int(11) unsigned NOT NULL AFTER max_updates;
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 4822e816a12..5e139dc652b 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -213,7 +213,7 @@ then
c_u="$c_u CREATE TABLE user ("
c_u="$c_u Host char(60) binary DEFAULT '' NOT NULL,"
c_u="$c_u User char(16) binary DEFAULT '' NOT NULL,"
- c_u="$c_u Password char(16) binary DEFAULT '' NOT NULL,"
+ c_u="$c_u Password char(45) binary DEFAULT '' NOT NULL,"
c_u="$c_u Select_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
c_u="$c_u Insert_priv enum('N','Y') DEFAULT 'N' NOT NULL,"
c_u="$c_u Update_priv enum('N','Y') DEFAULT 'N' NOT NULL,"