Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel

into  mysql.com:/home/my/mysql-5.0

client/mysqltest.c

@@ -1864,7 +1864,7 @@ void do_chmod_file(struct st_command *command)
     die("You must write a 4 digit octal number for mode");
 
   DBUG_PRINT("info", ("chmod %o %s", (uint)mode, ds_file.str));
-  handle_command_error(command, chmod(ds_file.str, (mode_t) mode));
+  handle_command_error(command, chmod(ds_file.str, mode));
   dynstr_free(&ds_mode);
   dynstr_free(&ds_file);
   DBUG_VOID_RETURN;

support-files/compiler_warnings.supp

@@ -4,9 +4,23 @@ DbdihMain.cpp : .*unused variable.* : 6666-6705
 DbtupExecQuery.cpp : .*unused variable.* : 1448-1449
 sql_yacc.cc : .*switch statement contains 'default' but no 'case' labels.*
 
+#
+# bdb is not critical to keep up to date
+#
+.*/bdb/.* : .*discards qualifiers from pointer target type.*
+.*/bdb/.* : .*unused parameter.*
+.*/bdb/.* : .*may be used uninitialized.*
+.*/bdb/.* : .*empty body in an if-statement.*
+db_vrfy.c : .*comparison is always false due to limited range of data type.*
+
 #
 # Ignore all conversion warnings on windows 64
 # (Is safe as we are not yet supporting strings >= 2G)
 #
 .* : conversion from 'size_t' to .*int'.*
 .* : conversion from '__int64' to .*int'.*
+
+#
+# The following should be fixed by the ndb team
+#
+.*/ndb/.* : .*used uninitialized in this function.*