Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


Build-tools/Do-compile:
  Auto merged
bdb/dist/configure.in:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

5 files changed, 21 insertions, 17 deletions

diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 1ab9835f758..add2ac86c81 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -75,13 +75,17 @@ if (@config_env > 0)
 }
 
 chomp($host=`hostname`);
+chomp($uname=`uname`);
 $full_host_name=$host;
 $connect_option= ($opt_tcpip ? "--host=$host" : "");
 $host =~ /^([^.-]*)/;
 $host=$1 . $opt_suffix;
 $email="$opt_user\@mysql.com";
-$pwd = `pwd`; chomp($pwd);
-$log="$pwd/Logs/$host$opt_version_suffix.log";
+chomp($pwd = `pwd`);
+$VER= `basename $opt_distribution`; chop $VER;
+$VER=~ /mysql.*-([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\.tar*/; $version=$1;
+($major, $minor, $release) = split(/\./,$version);
+$log="$pwd/Logs/$host-$major.$minor$opt_version_suffix.log";
 $opt_distribution =~ /(mysql[^\/]*)\.tar/;
 $ver=$1;
 $gcc_version=which("gcc");
@@ -559,9 +563,9 @@ sub abort
   {
     $mail_header_file="$opt_tmp/do-command.$$";
     open(TMP,">$mail_header_file");
-    print TMP "From: mysql\@$full_host_name\n";
+    print TMP "From: mysqldev\@$full_host_name\n";
     print TMP "To: $email\n";
-    print TMP "Subject: $ver$opt_version_suffix compilation failed\n\n";
+    print TMP "Subject: $host($uname): $ver$opt_version_suffix compilation failed\n\n";
     close TMP;
     system("tail -n 40 $log > $log.mail");
     system("cat $mail_header_file $log.mail | $sendmail -t -f $email");
diff --git a/bdb/dist/configure.in b/bdb/dist/configure.in
index 6656a588a66..08d60a6c07a 100644
--- a/bdb/dist/configure.in
+++ b/bdb/dist/configure.in
@@ -463,13 +463,6 @@ dnl deleted getwd().
 AC_REPLACE_FUNCS(getcwd getopt memcmp memcpy memmove)
 AC_REPLACE_FUNCS(raise snprintf strcasecmp strerror vsnprintf)
 
-dnl XXX
-dnl Nasty hack.  AC_REPLACE_FUNCS added entries of the form xxx.o to the
-dnl LIBOBJS variable.  They have to be xxx.lo if we are building shared
-dnl libraries.  Use sed, configure already requires it.
-tmp="`echo \"$LIBOBJS\" | sed \"s/\.o/${o}/g\"`"
-LIBOBJS="$tmp"
-
 dnl Check for system functions we optionally use.
 AC_CHECK_FUNCS(getuid pstat_getdynamic sysconf sched_yield strtoul yield)
 
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index 824dba7b65a..699e74834e3 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -2414,7 +2414,7 @@ sub Print_Header {
 sub Print_Footer {
     if ($MySQLaccess::CMD) { #command-line mode
     print "\n"
-         ."BUGs can be reported by email to Yves.Carlier\@rug.ac.be\n";
+         ."BUGs can be reported by email to bugs\@mysql.com\n";
     }
     if ($MySQLaccess::CGI) { #CGI-BIN mode
     if ($MySQLaccess::Param{'brief'}) {
@@ -2422,7 +2422,7 @@ sub Print_Footer {
     }
     print "<HR>\n"
          ."<ADDRESS>\n"
-         ."BUGs can be reported by email to <a href=mailto:Yves.Carlier\@rug.ac.be>Yves.Carlier\@rug.ac.be</a><BR>\n"
+         ."BUGs can be reported by email to <a href=mailto:bugs\@mysql.com>bugs\@mysql.com</a><BR>\n"
 #         ."Don't forget to mention the version $VERSION!<BR>\n"
          ."</ADDRESS>\n"
          ."</BODY>\n"
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index b8d4a0a9a38..1a694247461 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -49,8 +49,9 @@ Usage: $0 db_name[./table_regex/] [new_db_name | directory]
 
   -?, --help           display this helpscreen and exit
   -u, --user=#         user for database login if not current user
-  -p, --password=#     password to use when connecting to server
-  -h, --host=#	       Hostname for local server when connecting over TCP/IP
+  -p, --password=#     password to use when connecting to server (if not set
+                       in my.cnf, which is recommended)
+  -h, --host=#         Hostname for local server when connecting over TCP/IP
   -P, --port=#         port to use when connecting to local server with TCP/IP
   -S, --socket=#       socket to use when connecting to local server
 
@@ -893,7 +894,11 @@ user for database login if not current user
 
 =item -p, --password=#     
 
-password to use when connecting to server
+password to use when connecting to the server. Note that you are strongly
+encouraged *not* to use this option as every user would be able to see the
+password in the process list. Instead use the '[mysqlhotcopy]' section in
+one of the config files, normally /etc/my.cnf or your personal ~/.my.cnf.
+(See the chapter 'my.cnf Option Files' in the manual)
 
 =item -h, -h, --host=#
 
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 9091784bbf3..ee9d3f1c1ea 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1267,7 +1267,9 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
   {
     if (combo.password.length != HASH_PASSWORD_LENGTH)
     {
-      my_error(ER_PASSWORD_NO_MATCH,MYF(0));
+      my_printf_error(ER_PASSWORD_NO_MATCH,
+          "Password hash should be a %d-digit hexadecimal number",
+          MYF(0),HASH_PASSWORD_LENGTH);
       DBUG_RETURN(-1);
     }
     password=combo.password.str;