Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


client/mysqldump.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

4 files changed, 10 insertions, 7 deletions

diff --git a/mysys/default_modify.c b/mysys/default_modify.c
index de03d783c68..0f58b8a930c 100644
--- a/mysys/default_modify.c
+++ b/mysys/default_modify.c
@@ -197,7 +197,7 @@ int modify_defaults_file(const char *file_location, const char *option,
       goto err;
   }
   if (my_fclose(cnf_file, MYF(MY_WME)))
-    goto err;
+    DBUG_RETURN(1);
 
   my_free(file_buffer, MYF(0));
   DBUG_RETURN(0);
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c
index 1f3db84304e..e181ccfb88d 100644
--- a/mysys/mf_iocache2.c
+++ b/mysys/mf_iocache2.c
@@ -79,7 +79,7 @@ my_off_t my_b_safe_tell(IO_CACHE *info)
 
 void my_b_seek(IO_CACHE *info,my_off_t pos)
 {
-  my_off_t offset;  
+  my_off_t offset;
   DBUG_ENTER("my_b_seek");
   DBUG_PRINT("enter",("pos: %lu", (ulong) pos));
 
@@ -91,10 +91,10 @@ void my_b_seek(IO_CACHE *info,my_off_t pos)
      b) see if there is a better way to make it work
   */
   if (info->type == SEQ_READ_APPEND)
-    flush_io_cache(info);
-  
+    VOID(flush_io_cache(info));
+
   offset=(pos - info->pos_in_file);
-  
+
   if (info->type == READ_CACHE || info->type == SEQ_READ_APPEND)
   {
     /* TODO: explain why this works if pos < info->pos_in_file */
@@ -119,7 +119,7 @@ void my_b_seek(IO_CACHE *info,my_off_t pos)
       info->write_pos = info->write_buffer + offset;
       DBUG_VOID_RETURN;
     }
-    flush_io_cache(info);
+    VOID(flush_io_cache(info));
     /* Correct buffer end so that we write in increments of IO_SIZE */
     info->write_end=(info->write_buffer+info->buffer_length-
 		     (pos & (IO_SIZE-1)));
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index 4a917fc8287..e2875d9e53e 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -69,7 +69,7 @@ my_bool bitmap_init(MY_BITMAP *map, uchar *buf, uint bitmap_size,
 					(thread_safe ?
 					 sizeof(pthread_mutex_t) : 0),
 					MYF(MY_WME | MY_ZEROFILL))))
-    return 1;
+    DBUG_RETURN(1);
   map->bitmap_size=bitmap_size;
 #ifdef THREAD
   if (thread_safe)
diff --git a/mysys/my_error.c b/mysys/my_error.c
index 0c18bbf6e8b..d7177e7a047 100644
--- a/mysys/my_error.c
+++ b/mysys/my_error.c
@@ -189,7 +189,10 @@ int my_error_register(const char **errmsgs, int first, int last)
 
   /* Error numbers must be unique. No overlapping is allowed. */
   if (*search_meh_pp && ((*search_meh_pp)->meh_first <= last))
+  {
+    my_free((gptr)meh_p, MYF(0));
     return 1;
+  }
 
   /* Insert header into the chain. */
   meh_p->meh_next= *search_meh_pp;