Commit b78743d5 authored by unknown's avatar unknown

Fix to work with old ISAM privilege tables + ssl support.


Docs/manual.texi:
  Small change to binary install
parent c627eb76
...@@ -6253,11 +6253,14 @@ shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf - ...@@ -6253,11 +6253,14 @@ shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
shell> ln -s mysql-VERSION-OS mysql shell> ln -s mysql-VERSION-OS mysql
shell> cd mysql shell> cd mysql
shell> scripts/mysql_install_db shell> scripts/mysql_install_db
shell> chown -R root /usr/local/mysql shell> chown -R root .
shell> chown -R mysql /usr/local/mysql/data shell> chown -R mysql ./data
shell> chgrp -R mysql /usr/local/mysql shell> chgrp -R mysql .
shell> chown -R root /usr/local/mysql/bin shell> chown -R root ./bin
shell> bin/safe_mysqld --user=mysql & shell> bin/safe_mysqld --user=mysql &
or
shell> bin/mysqld_safe --user=mysql &
if you are running MySQL 4.x
@end example @end example
@cindex adding, new users @cindex adding, new users
...@@ -6519,6 +6522,9 @@ shell> chown -R mysql /usr/local/mysql/var ...@@ -6519,6 +6522,9 @@ shell> chown -R mysql /usr/local/mysql/var
shell> chgrp -R mysql /usr/local/mysql shell> chgrp -R mysql /usr/local/mysql
shell> cp support-files/my-medium.cnf /etc/my.cnf shell> cp support-files/my-medium.cnf /etc/my.cnf
shell> /usr/local/mysql/bin/safe_mysqld --user=mysql & 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 @end example
If you want have support for InnoDB tables, you should edit the If you want have support for InnoDB tables, you should edit the
...@@ -221,6 +221,8 @@ int acl_init(bool dont_read_acl_tables) ...@@ -221,6 +221,8 @@ int acl_init(bool dont_read_acl_tables)
user.x509_issuer=get_field(&mem, table, 19); user.x509_issuer=get_field(&mem, table, 19);
user.x509_subject=get_field(&mem, table, 20); user.x509_subject=get_field(&mem, table, 20);
} }
else
user.ssl_type=SSL_TYPE_NONE;
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
if (user.password && (length=(uint) strlen(user.password)) == 8 && if (user.password && (length=(uint) strlen(user.password)) == 8 &&
protocol_version == PROTOCOL_VERSION) protocol_version == PROTOCOL_VERSION)
...@@ -1201,7 +1203,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, ...@@ -1201,7 +1203,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
/* We write down SSL related ACL stuff */ /* We write down SSL related ACL stuff */
DBUG_PRINT("info",("table->fields=%d",table->fields)); DBUG_PRINT("info",("table->fields=%d",table->fields));
if (table->fields >= 21) /* From 4.0.0 we have more fields */ if (table->fields >= 21) /* From 4.0.0 we have more fields */
{ {
table->field[18]->store("",0); table->field[18]->store("",0);
table->field[19]->store("",0); table->field[19]->store("",0);
table->field[20]->store("",0); table->field[20]->store("",0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment