[mysql-connector-odbc] Rebase to version 5.3.2 MariaDB 10 compatibility

Jakub QB Dorňák jdornak at fedoraproject.org
Mon Jun 16 16:32:21 UTC 2014


commit 28a05d59541411246ef0f74550719b72ff0e502c
Author: Jakub Dorňák <jdornak at redhat.com>
Date:   Mon Jun 16 18:32:06 2014 +0200

    Rebase to version 5.3.2
    MariaDB 10 compatibility

 .gitignore                                 |    2 +
 myodbc-add-mysys.patch                     |   13 ++--
 myodbc-libdir.patch                        |   12 ---
 myodbc-maria.patch                         |   30 -------
 myodbc-mariadb10.patch                     |   67 ++++++++++++++++
 myodbc-movecmpfunc.patch                   |  113 ++++++++++++++++------------
 mysql-connector-odbc-5.2.5-aarch64.patch   |   10 +-
 mysql-connector-odbc-cleartext.patch       |    8 +-
 mysql-connector-odbc-format-security.patch |   24 +++++--
 mysql-connector-odbc.spec                  |   31 +++++---
 sources                                    |    4 +-
 11 files changed, 189 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c315d8a..dac4568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /mysql-connector-odbc-5.2.4-src.tar.gz
 /mysql-connector-odbc-5.2.5-src.tar.gz
 /mysql-connector-odbc-5.2.6-src.tar.gz
+/mysql-connector-odbc-5.3.2-src.tar.gz
+/mariadb-mysys.tar.gz
diff --git a/myodbc-add-mysys.patch b/myodbc-add-mysys.patch
index 1c57304..3984964 100644
--- a/myodbc-add-mysys.patch
+++ b/myodbc-add-mysys.patch
@@ -1,9 +1,9 @@
 Add files extracted from mysql into the driver build script.
 
-diff -up mysql-connector-odbc-5.2.6-src.orig/util/CMakeLists.txt mysql-connector-odbc-5.2.6-src/util/CMakeLists.txt
---- mysql-connector-odbc-5.2.6-src.orig/util/CMakeLists.txt	2013-09-25 18:59:00.000000000 +0200
-+++ mysql-connector-odbc-5.2.6-src/util/CMakeLists.txt	2013-03-25 19:17:17.320764909 +0100
-@@ -26,7 +26,24 @@ SET(myodbc3u_SRCS stringutil.c
+diff -up mysql-connector-odbc-5.3.2-src.orig/util/CMakeLists.txt mysql-connector-odbc-5.3.2-src/util/CMakeLists.txt
+--- mysql-connector-odbc-5.3.2-src.orig/util/CMakeLists.txt	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/util/CMakeLists.txt	2014-06-12 16:29:43.509032698 +0200
+@@ -26,7 +26,25 @@ SET(myodbc-util_SRCS stringutil.c
                    stringutil.h
                    unicode_transcode.c
                    installer.c
@@ -12,8 +12,9 @@ diff -up mysql-connector-odbc-5.2.6-src.orig/util/CMakeLists.txt mysql-connector
 +                  array.c
 +                  list.c
 +                  my_alloc.c
-+                  my_malloc.c
++                  mf_qsort.c
 +                  string.c
++                  strings_def.h
 +                  int2str.c
 +                  is_prefix.c
 +                  longlong2str.c
@@ -28,4 +29,4 @@ diff -up mysql-connector-odbc-5.2.6-src.orig/util/CMakeLists.txt mysql-connector
 +)
  
  IF(NOT WIN32)
-   SET(myodbc3u_SRCS ${myodbc3u_SRCS}
+   SET(myodbc-util_SRCS ${myodbc-util_SRCS}
diff --git a/myodbc-mariadb10.patch b/myodbc-mariadb10.patch
new file mode 100644
index 0000000..59ea78c
--- /dev/null
+++ b/myodbc-mariadb10.patch
@@ -0,0 +1,67 @@
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/driver/catalog_no_i_s.c mysql-connector-odbc-5.3.2-src/driver/catalog_no_i_s.c
+--- mysql-connector-odbc-5.3.2-src.orig/driver/catalog_no_i_s.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/driver/catalog_no_i_s.c	2014-06-16 13:15:14.909521023 +0200
+@@ -1093,7 +1093,7 @@ SQLRETURN mysql_foreign_keys(SQLHSTMT hs
+   unsigned long *lengths;
+   SQLRETURN rc= SQL_SUCCESS;
+ 
+-  my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0);
++  my_init_dynamic_array(&records, sizeof(MY_FOREIGN_KEY_FIELD), 0, 0, 0);
+ 
+   /* Get the list of tables that match szCatalog and szTable */
+   pthread_mutex_lock(&stmt->dbc->lock);
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/driver/desc.c mysql-connector-odbc-5.3.2-src/driver/desc.c
+--- mysql-connector-odbc-5.3.2-src.orig/driver/desc.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/driver/desc.c	2014-06-16 13:17:10.101169058 +0200
+@@ -63,13 +63,13 @@ DESC *desc_alloc(STMT *stmt, SQLSMALLINT
+      but in desc_get_rec we manually get a pointer to it. This avoids
+      having to call set_dynamic after modifying the DESCREC.
+   */
+-  if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
++  if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0, 0))
+   {
+     x_free((char *)desc);
+     return NULL;
+   }
+ 
+-  if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0))
++  if (my_init_dynamic_array(&desc->bookmark, sizeof(DESCREC), 0, 0, 0))
+   {
+     delete_dynamic(&desc->records);
+     x_free((char *)desc);
+@@ -997,7 +997,8 @@ SQLRETURN MySQLCopyDesc(SQLHDESC SourceD
+   delete_dynamic(&dest->records);
+   if (my_init_dynamic_array(&dest->records, sizeof(DESCREC),
+                             src->records.max_element,
+-                            src->records.alloc_increment))
++                            src->records.alloc_increment,
++                            0))
+   {
+     return set_desc_error(dest, "HY001",
+               "Memory allocation error",
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/driver/handle.c mysql-connector-odbc-5.3.2-src/driver/handle.c
+--- mysql-connector-odbc-5.3.2-src.orig/driver/handle.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/driver/handle.c	2014-06-16 13:16:06.788362495 +0200
+@@ -393,7 +393,7 @@ BOOL allocate_param_bind(DYNAMIC_ARRAY *
+     }
+   }
+ 
+-  my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10);
++  my_init_dynamic_array(*param_bind, sizeof(MYSQL_BIND), elements, 10, 0);
+   memset((*param_bind)->buffer, 0, sizeof(MYSQL_BIND) *
+ 											(*param_bind)->max_element);
+ 
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/driver/parse.c mysql-connector-odbc-5.3.2-src/driver/parse.c
+--- mysql-connector-odbc-5.3.2-src.orig/driver/parse.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/driver/parse.c	2014-06-16 13:15:45.556427366 +0200
+@@ -129,8 +129,8 @@ MY_PARSED_QUERY * init_parsed_query(MY_P
+ 
+     /* TODO: Store offsets rather than ptrs. In this case we will be fine
+        if work with copy of the originally parsed string */
+-    my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10);
+-    my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10);
++    my_init_dynamic_array(&pq->token,     sizeof(uint), 20, 10, 0);
++    my_init_dynamic_array(&pq->param_pos, sizeof(uint), 10, 10, 0);
+   }
+ 
+   return pq;
diff --git a/myodbc-movecmpfunc.patch b/myodbc-movecmpfunc.patch
index a158a1e..68f3015 100644
--- a/myodbc-movecmpfunc.patch
+++ b/myodbc-movecmpfunc.patch
@@ -8,47 +8,10 @@ However, the only function doing that is defined at driver/utility.c so it
 would be better to move it to util/stringutil.c and have it available as
 a general purpose function. That's basically what this patch does.
 
-diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/driver/utility.c mysql-connector-odbc-5.2.6-src/driver/utility.c
---- mysql-connector-odbc-5.2.6-src.orig/driver/utility.c	2014-01-24 10:36:10.476862138 +0100
-+++ mysql-connector-odbc-5.2.6-src/driver/utility.c	2014-01-24 10:36:20.521867126 +0100
-@@ -2277,33 +2277,6 @@ my_bool reget_current_catalog(DBC *dbc)
- 
- 
- /*
--  @type    : myodbc internal
--  @purpose : compare strings without regarding to case
--*/
--
--int myodbc_strcasecmp(const char *s, const char *t)
--{
--  while (toupper((uchar) *s) == toupper((uchar) *t++))
--    if (!*s++)
--      return 0;
--  return((int) toupper((uchar) s[0]) - (int) toupper((uchar) t[-1]));
--}
--
--
--/*
--  @type    : myodbc internal
--  @purpose : compare strings without regarding to case
--*/
--
--int myodbc_casecmp(const char *s, const char *t, uint len)
--{
--  while (len-- != 0 && toupper(*s++) == toupper(*t++))
--    ;
--  return (int)len + 1;
--}
--
--
--/*
-   @type    : myodbc3 internal
-   @purpose : logs the queries sent to server
- */
-diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/util/stringutil.c mysql-connector-odbc-5.2.6-src/util/stringutil.c
---- mysql-connector-odbc-5.2.6-src.orig/util/stringutil.c	2013-09-25 18:59:00.000000000 +0200
-+++ mysql-connector-odbc-5.2.6-src/util/stringutil.c	2014-01-24 10:36:20.522867127 +0100
-@@ -918,13 +918,40 @@ static const MY_CSET_OS_NAME charsets[]=
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/util/stringutil.c mysql-connector-odbc-5.3.2-src/util/stringutil.c
+--- mysql-connector-odbc-5.3.2-src.orig/util/stringutil.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/util/stringutil.c	2014-06-12 16:55:18.093235491 +0200
+@@ -925,13 +925,40 @@ static const MY_CSET_OS_NAME charsets[]=
  };
  
  
@@ -90,15 +53,71 @@ diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/util/stringutil.c mysql
      {
        switch (csp->param)
        {
-diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/util/stringutil.h mysql-connector-odbc-5.2.6-src/util/stringutil.h
---- mysql-connector-odbc-5.2.6-src.orig/util/stringutil.h	2013-09-25 18:59:00.000000000 +0200
-+++ mysql-connector-odbc-5.2.6-src/util/stringutil.h	2014-01-24 10:36:20.522867127 +0100
-@@ -117,6 +117,8 @@ size_t sqlwcharncat2(SQLWCHAR *dest, con
- SQLWCHAR *sqlwcharncpy(SQLWCHAR *dest, const SQLWCHAR *src, size_t n);
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/util/stringutil.h mysql-connector-odbc-5.3.2-src/util/stringutil.h
+--- mysql-connector-odbc-5.3.2-src.orig/util/stringutil.h	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/util/stringutil.h	2014-06-12 16:55:18.094235489 +0200
+@@ -119,6 +119,8 @@ SQLWCHAR *wchar_t_as_sqlwchar(wchar_t *f
  
  char * myodbc_strlwr(char *target, size_t len);
+ SQLCHAR* sqlwchar_as_utf8_simple(SQLWCHAR *s);
 +int myodbc_strcasecmp(const char *s, const char *t);
 +int myodbc_casecmp(const char *s, const char *t, uint len);
+ 
  #ifdef __cplusplus
  }
- #endif
+--- mysql-connector-odbc-5.3.2-src.orig/driver/utility.c	2014-06-16 13:11:32.417200884 +0200
++++ mysql-connector-odbc-5.3.2-src/driver/utility.c	2014-06-16 13:26:12.071513337 +0200
+@@ -2314,53 +2314,6 @@ my_bool reget_current_catalog(DBC *dbc)
+ 
+ 
+-/*
+-  @type    : myodbc internal
+-  @purpose : compare strings without regarding to case
+-*/
+-
+-int myodbc_strcasecmp(const char *s, const char *t)
+-{
+-  if (!s && !t)
+-  {
+-    return 0;
+-  }
+-
+-  if (!s || !t)
+-  {
+-    return 1;
+-  }
+-
+-  while (toupper((uchar) *s) == toupper((uchar) *t++))
+-    if (!*s++)
+-      return 0;
+-  return((int) toupper((uchar) s[0]) - (int) toupper((uchar) t[-1]));
+-}
+-
+-
+-/*
+-  @type    : myodbc internal
+-  @purpose : compare strings without regarding to case
+-*/
+-
+-int myodbc_casecmp(const char *s, const char *t, uint len)
+-{
+-  if (!s && !t)
+-  {
+-    return 0;
+-  }
+-
+-  if (!s || !t)
+-  {
+-    return (int)len + 1;
+-  }
+-
+-  while (len-- != 0 && toupper(*s++) == toupper(*t++))
+-    ;
+-  return (int)len + 1;
+-}
+-
+-
+ /*
+   @type    : myodbc3 internal
+   @purpose : logs the queries sent to server
+ */
diff --git a/mysql-connector-odbc-5.2.5-aarch64.patch b/mysql-connector-odbc-5.2.5-aarch64.patch
index 09ca63e..4ec11b6 100644
--- a/mysql-connector-odbc-5.2.5-aarch64.patch
+++ b/mysql-connector-odbc-5.2.5-aarch64.patch
@@ -1,11 +1,11 @@
-diff -up mysql-connector-odbc-5.2.6-src.orig/CMakeLists.txt mysql-connector-odbc-5.2.6-src/CMakeLists.txt
---- mysql-connector-odbc-5.2.6-src.orig/CMakeLists.txt	2014-01-24 13:29:59.032143181 +0100
-+++ mysql-connector-odbc-5.2.6-src/CMakeLists.txt	2014-01-24 13:30:09.024135998 +0100
-@@ -242,7 +242,7 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINA
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/CMakeLists.txt mysql-connector-odbc-5.3.2-src/CMakeLists.txt
+--- mysql-connector-odbc-5.3.2-src.orig/CMakeLists.txt	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/CMakeLists.txt	2014-06-12 17:13:06.287288410 +0200
+@@ -251,7 +251,7 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINA
  SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
  
  SET(LIB_SUBDIR "lib")
--IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)")
+-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)") 
 +IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|aarch64|ppc64|ppc64p7|s390x|sparc64)")
    SET(LIB_SUBDIR "lib64")
  ENDIF()
diff --git a/mysql-connector-odbc-cleartext.patch b/mysql-connector-odbc-cleartext.patch
index 915986b..aef5bea 100644
--- a/mysql-connector-odbc-cleartext.patch
+++ b/mysql-connector-odbc-cleartext.patch
@@ -4,10 +4,10 @@ so we cannot use it.
 
 MariaDB upstream report: https://mariadb.atlassian.net/browse/MDEV-4573
 
-diff -up mysql-connector-odbc-5.2.6-src.orig/driver/connect.c mysql-connector-odbc-5.2.6-src/driver/connect.c
---- mysql-connector-odbc-5.2.6-src.orig/driver/connect.c	2013-09-25 18:59:00.000000000 +0200
-+++ mysql-connector-odbc-5.2.6-src/driver/connect.c	2014-01-24 13:22:10.149482711 +0100
-@@ -257,7 +257,7 @@ SQLRETURN myodbc_do_connect(DBC *dbc, Da
+diff -up mysql-connector-odbc-5.3.2-src.orig/driver/connect.c mysql-connector-odbc-5.3.2-src/driver/connect.c
+--- mysql-connector-odbc-5.3.2-src.orig/driver/connect.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/driver/connect.c	2014-06-12 17:06:12.807042093 +0200
+@@ -265,7 +265,7 @@ SQLRETURN myodbc_do_connect(DBC *dbc, Da
    }
  #endif
  
diff --git a/mysql-connector-odbc-format-security.patch b/mysql-connector-odbc-format-security.patch
index ea48d48..3e022c1 100644
--- a/mysql-connector-odbc-format-security.patch
+++ b/mysql-connector-odbc-format-security.patch
@@ -1,6 +1,6 @@
-diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/dltest/dltest.c mysql-connector-odbc-5.2.6-src/dltest/dltest.c
---- mysql-connector-odbc-5.2.6-src.orig/dltest/dltest.c	2013-09-25 18:59:00.000000000 +0200
-+++ mysql-connector-odbc-5.2.6-src/dltest/dltest.c	2014-01-24 13:27:51.934235138 +0100
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/dltest/dltest.c mysql-connector-odbc-5.3.2-src/dltest/dltest.c
+--- mysql-connector-odbc-5.3.2-src.orig/dltest/dltest.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/dltest/dltest.c	2014-06-16 13:51:15.025922019 +0200
 @@ -84,7 +84,7 @@ int main( int argc, char *argv[] )
  
    if ( argc < 2 )
@@ -10,9 +10,9 @@ diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/dltest/dltest.c mysql-c
        exit( 1 );
    }
  
-diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/installer/myodbc3i.c mysql-connector-odbc-5.2.6-src/installer/myodbc3i.c
---- mysql-connector-odbc-5.2.6-src.orig/installer/myodbc3i.c	2013-09-25 18:59:00.000000000 +0200
-+++ mysql-connector-odbc-5.2.6-src/installer/myodbc3i.c	2014-01-24 13:27:51.935235137 +0100
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/installer/myodbc-installer.c mysql-connector-odbc-5.3.2-src/installer/myodbc-installer.c
+--- mysql-connector-odbc-5.3.2-src.orig/installer/myodbc-installer.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/installer/myodbc-installer.c	2014-06-16 14:12:08.300093445 +0200
 @@ -148,7 +148,7 @@ void action_usage()
  
  void main_usage()
@@ -22,3 +22,15 @@ diff -up --recursive mysql-connector-odbc-5.2.6-src.orig/installer/myodbc3i.c my
  }
  
  
+diff -up --recursive mysql-connector-odbc-5.3.2-src.orig/setupgui/gtk/odbcdialogparams.c mysql-connector-odbc-5.3.2-src/setupgui/gtk/odbcdialogparams.c
+--- mysql-connector-odbc-5.3.2-src.orig/setupgui/gtk/odbcdialogparams.c	2014-03-26 22:20:55.000000000 +0100
++++ mysql-connector-odbc-5.3.2-src/setupgui/gtk/odbcdialogparams.c	2014-06-16 14:06:35.112111288 +0200
+@@ -505,7 +505,7 @@ int ShowOdbcParamsDialog(DataSource* par
+       snprintf(msg, msglen, "Failure to lookup driver entry at path '%s'('%s')",
+                driver->lib8, params->name8);
+ 
+-      msg_box= gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, (gchar *)msg);
++      msg_box= gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", (gchar *)msg);
+ 
+       gtk_dialog_run (GTK_DIALOG (msg_box));
+       gtk_widget_hide(msg_box);
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index 7e44838..18cb2c2 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
-Version: 5.2.6
-Release: 2%{?dist}
+Version: 5.3.2
+Release: 1%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/
 # exceptions allow library to be linked with most open source SW,
@@ -17,20 +17,19 @@ Source0: http://dev.mysql.com/get/Downloads/Connector-ODBC/5.2/%{name}-%{version
 # license, so this creates no legal issues.  (Note: we don't worry about
 # polluting application namespace in mysql-connector-odbc, since it's never
 # directly statically linked with any application code.)
-Source1: mysql-mysys.tar.gz
+Source1: mariadb-mysys.tar.gz
 
 Patch1: myodbc-add-mysys.patch
 Patch2: myodbc-shutdown.patch
 Patch3: myodbc-64bit.patch
-Patch4: myodbc-maria.patch
-Patch5: myodbc-movecmpfunc.patch
-Patch6: myodbc-libdir.patch
-Patch7: mysql-connector-odbc-buffsize.patch
-Patch8: mysql-connector-odbc-cleartext.patch
-Patch9: mysql-connector-odbc-format-security.patch
-Patch10: mysql-connector-odbc-5.2.5-aarch64.patch
-
-BuildRequires: mysql-devel unixODBC-devel
+Patch4: myodbc-movecmpfunc.patch
+Patch5: mysql-connector-odbc-buffsize.patch
+Patch6: mysql-connector-odbc-cleartext.patch
+Patch7: mysql-connector-odbc-format-security.patch
+Patch8: mysql-connector-odbc-5.2.5-aarch64.patch
+Patch9: myodbc-mariadb10.patch
+
+BuildRequires: mysql-devel unixODBC-devel gtk3-devel
 BuildRequires: cmake
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -51,7 +50,9 @@ tar xfz %{SOURCE1}
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+
+# mysql_config does not support --cxxflags option
+sed -i 's/--cxxflags/--cflags/g' cmake/FindMySQL.cmake
 
 %build
 # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has
@@ -99,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT/usr/test
 %{_libdir}/lib*so
 
 %changelog
+* Thu Jun 12 2014 Jakub Dorňák <jdornak at redhat.com> - 5.3.2-1
+- Rebase to version 5.3.2
+- MariaDB 10 compatibility
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index e2254fa..dbcc302 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-066bfed7dc472ef4b68bafc95ca45027  mysql-connector-odbc-5.2.6-src.tar.gz
-58125c640c9c73c5288966bb85e6bb98  mysql-mysys.tar.gz
+389010eb70df759e6adb50983a31c9a3  mysql-connector-odbc-5.3.2-src.tar.gz
+55520d6ae84cbc0a0693f18393255a07  mariadb-mysys.tar.gz


More information about the scm-commits mailing list