1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
|
Last-Update: 2016-11-16
Forwarded: not-needed
Origin: https://packages.altlinux.org/en/p8/srpms/mysql-workbench-community/patches/mysql-workbench-mariadb-build.patch
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: fix FTBFS with MariaDB.
mysql_real_escape_string_quote() has been implemented as a replacement
for mysql_real_escape_string() in MySQL 5.7.6 but is not implemented
in libmysqlclient of MariaDB 10.0.21
--- a/plugins/migration/copytable/copytable.cpp
+++ b/plugins/migration/copytable/copytable.cpp
@@ -2846,16 +2846,9 @@
// This function is used to create a legal SQL string that you can use in an SQL statement
// This is needed because the escaping depends on the character set in use by the server
unsigned long ret_length = 0;
- #if MYSQL_CHECK_VERSION(5, 7, 6)
- if (_target->is_mysql_version_at_least(5, 7, 6))
- ret_length += mysql_real_escape_string_quote(_mysql, buffer + length, data, (unsigned long)dlength, '`');
- else
- ret_length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength);
- #else
ret_length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength);
- #endif
if( ret_length != (unsigned long) -1)
length += ret_length;
else
|