From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../mysql-workbench-6.3.3-mysql_options4.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch (limited to 'dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch') diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch new file mode 100644 index 000000000000..7fb9c8d57fc5 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.3.3-mysql_options4.patch @@ -0,0 +1,40 @@ +--- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-15 15:54:19.000000000 +0200 ++++ plugins/migration/copytable/copytable.cpp 2015-04-26 08:53:08.871167725 +0200 +@@ -1920,12 +1920,17 @@ + _incoming_data_charset = "latin1"; + + mysql_init(&_mysql); ++/* This is optional has compiled in for MySQL >= 5.6.6 ++ * Looks like MariaDB does not support this as supposed, ++ * so disable completly. */ ++#ifndef MARIADB_BASE_VERSION + #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) + #if MYSQL_CHECK_VERSION(5,6,6) + if (is_mysql_version_at_least(5,6,6)) + mysql_options4(&_mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", app_name.c_str()); + #endif + #endif ++#endif + + // _bulk_insert_record is used to prepare a single record string, the connection + // is needed to escape binary data properly +--- plugins/migration/copytable/copytable.cpp.~1~ 2015-04-26 08:57:30.444285953 +0200 ++++ plugins/migration/copytable/copytable.cpp 2015-04-26 10:16:39.234711324 +0200 +@@ -2875,6 +2875,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 ++ #ifdef MARIADB_BASE_VERSION ++ length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); ++ #else + #if defined(MYSQL_VERSION_MAJOR) && defined(MYSQL_VERSION_MINOR) && defined(MYSQL_VERSION_PATCH) + #if MYSQL_CHECK_VERSION(5,7,6) + if (is_mysql_version_at_least(5,7,6)) +@@ -2885,6 +2888,7 @@ + length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); + #endif + #endif ++ #endif + + return true; + } -- cgit v1.2.3