Merge with 4.0 tree

BitKeeper/etc/logging_ok:
  auto-union
scripts/Makefile.am:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
BUILD/compile-pentium-gcov:
  merge
myisam/mi_test2.c:
  use original code
mysql-test/t/range.test:
  Fixed comment
mysys/mf_keycache.c:
  Fixed comments

8 files changed, 11 insertions, 7 deletions

diff --git a/BUILD/compile-pentium-gcov b/BUILD/compile-pentium-gcov
index dc4ddcb1090..05cb0bb0d78 100755
--- a/BUILD/compile-pentium-gcov
+++ b/BUILD/compile-pentium-gcov
@@ -3,7 +3,7 @@
 path=`dirname $0`
 . "$path/SETUP.sh"
 
-extra_flags="$pentium_cflags  -fprofile-arcs -ftest-coverage -fmessage-length=0 "
+extra_flags="$pentium_cflags  -fprofile-arcs -ftest-coverage"
 extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"
 extra_configs="$extra_configs  --with-innodb --with-berkeley-db"
 
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 0cb7fbd10fd..86fcc8687d7 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -111,6 +111,7 @@ root@x3.internalnet
 salle@banica.(none)
 salle@geopard.(none)
 salle@geopard.online.bg
+salle@vafla.online.bg
 sasha@mysql.sashanet.com
 serg@build.mysql2.com
 serg@serg.mylan
diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
index 65ba2ee6671..75cbb756998 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/t/range.test
@@ -223,7 +223,7 @@ INSERT INTO t1 VALUES
 (21,4),(22,5),(23,5),(24,5),(25,5),(26,5),(30,5),(31,5),(32,5),(33,5),
 (33,5),(33,5),(33,5),(33,5),(34,5),(35,5);
 
-# we expect that optimizer will choose key on A
+# we expect that optimizer will choose index on A
 EXPLAIN SELECT * FROM t1 WHERE a IN(1,2) AND b=5;
 SELECT * FROM t1 WHERE a IN(1,2) AND b=5;
 
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 280b69b18bf..406b826382a 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -2038,7 +2038,7 @@ static int flush_cached_blocks(KEY_CACHE *keycache,
 /*
   flush all key blocks for a file to disk, but don't do any mutex locks
 
-    flush_key_blocks()
+    flush_key_blocks_int()
       keycache            pointer to a key cache data structure
       file                handler for the file to flush to
       flush_type          type of the flush
@@ -2255,7 +2255,7 @@ restart:
   RETURN
     0   ok
     1  error
- */
+*/
 
 int flush_key_blocks(KEY_CACHE_HANDLE key_cache,
                      File file, enum flush_type type)
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index bf40ffc5b4d..54aa4d421f6 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -770,7 +770,9 @@ bool thr_got_alarm(thr_alarm_t *alrm_ptr)
 void thr_end_alarm(thr_alarm_t *alrm_ptr)
 {
   thr_alarm_t alrm= *alrm_ptr;
+  /* alrm may be zero if thr_alarm aborted with an error */
   if (alrm && alrm->crono)
+
   {
     KillTimer(NULL, alrm->crono);
     alrm->crono = 0;
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 48592d2ff00..037adc64d39 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -120,6 +120,7 @@ SUFFIXES = .sh
 	  -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
 	  -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
 	  -e 's!@''LIBS''@!@LIBS@!' \
+	  -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
 	  -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
 	  -e 's!@''openssl_libs''@!@openssl_libs@!' \
 	  -e 's!@''VERSION''@!@VERSION@!' \
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 6b543bf4a07..051f3fa9c14 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -92,7 +92,7 @@ libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
 libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
 cflags="-I$pkgincludedir @CFLAGS@"
 include="-I$pkgincludedir"
-embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @innodb_system_libs@"
+embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @WRAPLIBS@ @innodb_system_libs@"
 embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
 
 # Remove some options that a client doesn't have to care about
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index bce1022d5c0..78e8c877c45 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -242,8 +242,8 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
     {
       if (err != HA_ERR_KEY_NOT_FOUND && err != HA_ERR_END_OF_FILE)
       {
-        sql_print_error("mysql_ha_read: Got error %d when reading table",
-                        err);
+        sql_print_error("mysql_ha_read: Got error %d when reading table '%s'",
+                        err, tables->real_name);
         table->file->print_error(err,MYF(0));
         goto err;
       }