unsigned int use_unicode)
{
if (!charset || !data) {
-@@ -756,7 +756,8 @@ mytopy_string(const char *data, const unsigned long length,
+@@ -756,7 +756,8 @@ mytopy_string(const char *data, const un
return NULL;
}
-- if (!(flags & BINARY_FLAG) && use_unicode && strcmp(charset, "binary") != 0)
+- if (!((flags != NULL) & flags & BINARY_FLAG) && use_unicode && strcmp(charset, "binary") != 0)
+ // 63 == binary: https://dev.mysql.com/doc/internals/en/charsets.html
+ if (charsetnr != 63 && use_unicode && strcmp(charset, "binary") != 0)
{
Name: python-%{pname}
# check documentation to see which version is GA (we don't want devel releases)
# https://dev.mysql.com/downloads/connector/python/
-Version: 8.0.11
-Release: 4
+Version: 8.0.12
+Release: 1
License: GPL v2
Group: Libraries/Python
Source0: http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-%{version}.zip
-# Source0-md5: d47704b39d794b287d146c3d772ab896
+# Source0-md5: 356f20fd899837178f7719e54095d2ae
Patch0: 32bit.patch
Patch1: binary-bug-90585.patch
Patch2: tests.patch
%{py_sitedir}/mysql/connector/*.py[co]
%dir %{py_sitedir}/mysql/connector/django
%{py_sitedir}/mysql/connector/django/*.py[co]
-%dir %{py_sitedir}/mysql/connector/fabric
-%{py_sitedir}/mysql/connector/fabric/*.py[co]
%dir %{py_sitedir}/mysql/connector/locales
%{py_sitedir}/mysql/connector/locales/*.py[co]
%dir %{py_sitedir}/mysql/connector/locales/eng
%{py3_sitedir}/mysql/connector/django/*.py
%dir %{py3_sitedir}/mysql/connector/django/__pycache__
%{py3_sitedir}/mysql/connector/django/__pycache__/*.py[co]
-%dir %{py3_sitedir}/mysql/connector/fabric
-%{py3_sitedir}/mysql/connector/fabric/*.py
-%dir %{py3_sitedir}/mysql/connector/fabric/__pycache__
-%{py3_sitedir}/mysql/connector/fabric/__pycache__/*.py[co]
%dir %{py3_sitedir}/mysql/connector/locales
%{py3_sitedir}/mysql/connector/locales/*.py
%dir %{py3_sitedir}/mysql/connector/locales/__pycache__
--- mysql-connector-python-8.0.11/tests/mysqld.py~ 2018-04-10 14:35:30.000000000 +0200
+++ mysql-connector-python-8.0.11/tests/mysqld.py 2018-05-28 08:25:18.652587431 +0200
-@@ -185,24 +185,7 @@ class MySQLServerBase(object):
+@@ -184,35 +184,7 @@ class MySQLServerBase(object):
+ Raises MySQLBootstrapError when something fails.
"""
- # Locate mysqld, mysql binaries
+- # Locate mysqld, mysql binaries
- LOGGER.info("Locating mysql binaries (could take a while)")
- files_to_find = [EXEC_MYSQL, EXEC_MYSQLD]
- for root, dirs, files in os.walk(self._basedir):
- if (afile == EXEC_MYSQLD and
- os.access(os.path.join(root, afile), 0)):
- self._sbindir = root
-- files_to_find.remove(EXEC_MYSQLD)
+- LOGGER.debug("Located {} in {}".format(
+- EXEC_MYSQLD, self._sbindir))
+- try:
+- files_to_find.remove(EXEC_MYSQLD)
+- except ValueError:
+- pass
- elif (afile == EXEC_MYSQL and
- os.access(os.path.join(root, afile), 0)):
- self._bindir = root
-- files_to_find.remove(EXEC_MYSQL)
+- LOGGER.debug("Located {} in {}".format(
+- EXEC_MYSQL, self._bindir))
+- try:
+- files_to_find.remove(EXEC_MYSQLD)
+- except ValueError:
+- pass
-
- if not files_to_find:
- break