diff options
| author | unknown <monty@tik.mysql.fi> | 2002-02-18 23:54:45 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2002-02-18 23:54:45 +0200 |
| commit | b78743d5662be5758a53637c120c1908c16fcb74 (patch) | |
| tree | 550d61305efe42e8cde57fa3b0dff3823b3e2471 | |
| parent | c627eb7601f35b3ecaad87603b1de7e5ce50d11e (diff) | |
| download | mariadb-git-b78743d5662be5758a53637c120c1908c16fcb74.tar.gz | |
Fix to work with old ISAM privilege tables + ssl support.
Docs/manual.texi:
Small change to binary install
| -rw-r--r-- | Docs/manual.texi | 14 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 1aed3ac6868..a82c46855f7 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -6253,11 +6253,14 @@ shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf - shell> ln -s mysql-VERSION-OS mysql shell> cd mysql shell> scripts/mysql_install_db -shell> chown -R root /usr/local/mysql -shell> chown -R mysql /usr/local/mysql/data -shell> chgrp -R mysql /usr/local/mysql -shell> chown -R root /usr/local/mysql/bin +shell> chown -R root . +shell> chown -R mysql ./data +shell> chgrp -R mysql . +shell> chown -R root ./bin shell> bin/safe_mysqld --user=mysql & +or +shell> bin/mysqld_safe --user=mysql & +if you are running MySQL 4.x @end example @cindex adding, new users @@ -6519,6 +6522,9 @@ shell> chown -R mysql /usr/local/mysql/var shell> chgrp -R mysql /usr/local/mysql shell> cp support-files/my-medium.cnf /etc/my.cnf shell> /usr/local/mysql/bin/safe_mysqld --user=mysql & +or +shell> /usr/local/mysql/bin/mysqld_safe --user=mysql & +if you are running MySQL 4.x. @end example If you want have support for InnoDB tables, you should edit the diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 577084a650a..8f9ce88f7ce 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -221,6 +221,8 @@ int acl_init(bool dont_read_acl_tables) user.x509_issuer=get_field(&mem, table, 19); user.x509_subject=get_field(&mem, table, 20); } + else + user.ssl_type=SSL_TYPE_NONE; #endif /* HAVE_OPENSSL */ if (user.password && (length=(uint) strlen(user.password)) == 8 && protocol_version == PROTOCOL_VERSION) @@ -1201,7 +1203,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, /* We write down SSL related ACL stuff */ DBUG_PRINT("info",("table->fields=%d",table->fields)); if (table->fields >= 21) /* From 4.0.0 we have more fields */ - { + { table->field[18]->store("",0); table->field[19]->store("",0); table->field[20]->store("",0); |