From 6961e0069b9df8508c999f00fab89017899092f6 Mon Sep 17 00:00:00 2001
From: "vva@eagle.mysql.r18.ru" <>
Date: Sat, 21 Dec 2002 02:53:07 +0400
Subject: fix some warnings

---
 libmysqld/libmysqld.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'libmysqld/libmysqld.c')

diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 114a7ebf921..de8efd9d2f4 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -463,7 +463,7 @@ static int add_init_command(struct st_mysql_options *options, const char *cmd)
   }
 
   if (!(tmp= my_strdup(cmd,MYF(MY_WME))) ||
-      insert_dynamic(options->init_commands, (byte*)&tmp))
+      insert_dynamic(options->init_commands, (gptr)&tmp))
   {
     my_free(tmp, MYF(MY_ALLOW_ZERO_PTR));
     return 1;
@@ -1152,8 +1152,13 @@ mysql_close(MYSQL *mysql)
     my_free(mysql->options.charset_name,MYF(MY_ALLOW_ZERO_PTR));
     if (mysql->options.init_commands)
     {
-      delete_dynamic(mysql->options.init_commands);
-      my_free((char*)mysql->options.init_commands,MYF(MY_WME));
+      DYNAMIC_ARRAY *init_commands= mysql->options.init_commands;
+      char **ptr= (char**)init_commands->buffer;
+      char **end= ptr + init_commands->elements;
+      for (; ptr<end; ptr++)
+	my_free(*ptr,MYF(MY_WME));
+      delete_dynamic(init_commands);
+      my_free((char*)init_commands,MYF(MY_WME));
     }
     /* Clear pointers for better safety */
     mysql->host_info=mysql->user=mysql->passwd=mysql->db=0;
-- 
cgit v1.2.1