1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merged

Browse Source 
Docs/Makefile.am:
  Auto merged
acinclude.m4:
  Auto merged
sql/sql_acl.cc:
  Auto merged
This commit is contained in:
unknown 2003-08-07 14:39:34 +02:00
commit 5d17247128
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Docs/Makefile.am
View File

@ -41,10 +41,10 @@ paper: manual_a4.ps manual_letter.ps $(PDFMANUAL)
# The Makefile contains the previous version so we can not use that # The Makefile contains the previous version so we can not use that
include.texi: ../configure.in include.texi: ../configure.in
echo "@c This file is autogenerated by the Makefile" > $@ 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 | \ grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> $@ 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 | \ grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> $@ sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> $@

4
sql/sql_acl.cc
View File

@ -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)", "Found old style password for user '%s'. Ignoring user. (You may want to restart mysqld using --old-protocol)",
user.user ? user.user : ""); /* purecov: tested */ user.user ? user.user : ""); /* purecov: tested */
} }
else if (length % 8) // This holds true for passwords else if (length % 8 || length > 16)
{ {
sql_print_error( 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.user ? user.user : "",
user.host.hostname ? user.host.hostname : ""); /* purecov: tested */ user.host.hostname ? user.host.hostname : ""); /* purecov: tested */
continue; /* purecov: tested */ continue; /* purecov: tested */