diff options
| author | monty@tik.mysql.fi <> | 2002-02-19 00:02:55 +0200 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2002-02-19 00:02:55 +0200 |
| commit | c639329afbde2bd9d59b488d43dde355c1c54678 (patch) | |
| tree | 4a8e51b923e0c0c3a6395817771e3e6aa9842cb4 | |
| parent | 9e21382065dbaf3b060973e8fe2f6b7c64853ad6 (diff) | |
| parent | d7c268b32582dda73132ec3a50a4eb8270ce6ae4 (diff) | |
| download | mariadb-git-c639329afbde2bd9d59b488d43dde355c1c54678.tar.gz | |
Merge hundin:/my/mysql-4.0 into tik.mysql.fi:/home/my/mysql-4.0
| -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 cf35d672ec0..689453083d9 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 @@ -6521,6 +6524,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); |