merge with 4.0

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
  Auto merged
Docs/Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log.cc:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/mysqldump.c:
  merge with 4.0
  (This only reorders options)
sql/ha_innodb.cc:
  merge with 4.0 (Keep original code)
sql/time.cc:
  Note that part of this patch is done in my_time.c

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 98dde1071c3..9067d01a06d 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1685,7 +1685,7 @@ static int replace_db_table(TABLE *table, const char *db,
 	goto table_error;			/* purecov: deadcode */
     }
   }
-  else if ((error=table->file->write_row(table->record[0])))
+  else if (rights && (error=table->file->write_row(table->record[0])))
   {
     if (error && error != HA_ERR_FOUND_DUPP_KEY) /* purecov: inspected */
       goto table_error; /* purecov: deadcode */
@@ -1695,6 +1695,7 @@ static int replace_db_table(TABLE *table, const char *db,
   if (old_row_exists)
     acl_update_db(combo.user.str,combo.host.str,db,rights);
   else
+  if (rights)
     acl_insert_db(combo.user.str,combo.host.str,db,rights);
   DBUG_RETURN(0);