- up to percona 5.5.57-38.9

[packages/mysql.git] / mysql-build.patch

diff -urNbB mysql-5.0.13-rc.org/sql/mysqld.cc mysql-5.0.13-rc/sql/mysqld.cc
--- mysql-5.0.13-rc.org/sql/mysqld.cc	2005-09-22 21:39:56.000000000 +0200
+++ mysql-5.0.13-rc/sql/mysqld.cc	2005-09-29 19:29:59.991454000 +0200
@@ -3183,7 +3183,7 @@
   init_ssl();
 
 #ifdef HAVE_LIBWRAP
-  libwrapName= my_progname+dirname_length(my_progname);
+  libwrapName= (char *)my_progname+dirname_length(my_progname);
   openlog(libwrapName, LOG_PID, LOG_AUTH);
 #endif
 
From ae21683d980d5fe9e39bd0193827ea3604256eb9 Mon Sep 17 00:00:00 2001
From: Jon Olav Hauglid <jon.hauglid@oracle.com>
Date: Thu, 28 Feb 2013 14:55:23 +0100
Subject: [PATCH] Bug#16265300: Fix new compilation warnings from XCode 4.6

This patch fixes three new compilation warnings generated by Clang.
It also adds -Wall flag for Clang and disables -Wnull-conversion
and -Wunused-private-field.
---
 client/mysql.cc                   | 4 ++--
 configure.cmake                   | 9 +++++++++
 sql/sql_partition.cc              | 2 +-
 storage/innobase/row/row0merge.cc | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/client/mysql.cc b/client/mysql.cc
index eca1be0a623..f6a75f47043 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2911,7 +2911,7 @@ You can turn off this feature to get a quicker startup with -A\n\n");
         mysql_free_result(fields);
         break;
       }
-      field_names[i][num_fields*2]= '\0';
+      field_names[i][num_fields*2]= NULL;
       j=0;
       while ((sql_field=mysql_fetch_field(fields)))
       {
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 201f64522a6..e23fe70ec86 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -284,7 +284,7 @@ bool partition_default_handling(TABLE *table, partition_info *part_info,
     }
   }
   part_info->set_up_defaults_for_partitioning(table->file,
-                                              (ulonglong)0, (uint)0);
+                                              NULL, 0U);
   DBUG_RETURN(FALSE);
 }