diff options
| author | unknown <serg@serg.mylan> | 2003-08-07 16:27:05 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-08-07 16:27:05 +0200 |
| commit | bbc9d64fea129bd0a776a109ed1ceac75bf894b9 (patch) | |
| tree | 40293ce97256c30c37c972620d7d39e67a312efe | |
| parent | e9e6627d03ee059668aec8b5bc22007f626011f8 (diff) | |
| parent | 5d1724712843a26f101bd0390050f2ec434305f4 (diff) | |
| download | mariadb-git-bbc9d64fea129bd0a776a109ed1ceac75bf894b9.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| -rw-r--r-- | Docs/Makefile.am | 4 | ||||
| -rw-r--r-- | sql/sql_acl.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 0beaa44c7eb..07dac2d9df1 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -41,10 +41,10 @@ paper: manual_a4.ps manual_letter.ps $(PDFMANUAL) # The Makefile contains the previous version so we can not use that include.texi: ../configure.in echo "@c This file is autogenerated by the Makefile" > $@ - echo -n "@set mysql_version " >> $@ + echo -n "@set mysqlversion " >> $@ grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \ sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> $@ - echo -n "@set default_port " >> $@ + echo -n "@set defaultport " >> $@ grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \ sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> $@ diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 3a3de2abf10..714a416ab95 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -233,10 +233,10 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) "Found old style password for user '%s'. Ignoring user. (You may want to restart mysqld using --old-protocol)", user.user ? user.user : ""); /* purecov: tested */ } - else if (length % 8) // This holds true for passwords + else if (length % 8 || length > 16) { sql_print_error( - "Found invalid password for user: '%s@%s'; Ignoring user", + "Found invalid password for user: '%s'@'%s'; Ignoring user", user.user ? user.user : "", user.host.hostname ? user.host.hostname : ""); /* purecov: tested */ continue; /* purecov: tested */ |