After merge fixes

client/mysqldump.c:
  Merge with 4.0 (and reordering of options)
client/mysqltest.c:
  Added DB as a user variable
myisam/mi_check.c:
  Trivial cleanup
mysql-test/r/grant.result:
  Move test to be in same order as in 4.0
mysql-test/r/mix_innodb_myisam_binlog.result:
  Updated results
mysql-test/r/ps_1general.result:
  Updated tests to work after privilege fixes
mysql-test/r/timezone3.result:
  Updated results to 4.1
mysql-test/t/ps_1general.test:
  Updated tests to work after privilege fixes
sql-common/my_time.c:
  Applied sub-second patch from 4.0
sql/sql_acl.cc:
  More debugging

1 files changed, 5 insertions, 4 deletions

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index bf684270c0a..2999482549c 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -658,10 +658,11 @@ static int chk_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo,
           goto err;
         if (tmp_keys + subkeys)
         {
-          mi_check_print_error(param,"Number of words in the 2nd level tree "
-                                  "does not match the number in the header. "
-                                  "Parent word in on the page %s, offset %d",
-                                  llstr(page,llbuff), old_keypos-buff);
+          mi_check_print_error(param,
+                               "Number of words in the 2nd level tree "
+                               "does not match the number in the header. "
+                               "Parent word in on the page %s, offset %u",
+                               llstr(page,llbuff), (uint) (old_keypos-buff));
           goto err;
         }
         (*keys)+=tmp_keys-1;