diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
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 <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch')
| -rw-r--r-- | dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch new file mode 100644 index 000000000000..e0dbc2bef5e0 --- /dev/null +++ b/dev-db/mysql-workbench/files/mysql-workbench-6.1.7-mysql_options4.patch @@ -0,0 +1,29 @@ +Patch taken from opensuse: +https://www.mail-archive.com/opensuse-commit@opensuse.org/msg60296.html + +Modified to be conditional on MARIADB_BASE_VERSION + +++++++ mysql-workbench-mysql_options4.patch ++++++ +diff --git a/plugins/migration/copytable/copytable.cpp +b/plugins/migration/copytable/copytable.cpp +index b273287..77c227b 100644 +--- a/plugins/migration/copytable/copytable.cpp ++++ b/plugins/migration/copytable/copytable.cpp +@@ -1633,12 +1633,17 @@ MySQLCopyDataTarget::MySQLCopyDataTarget(const + std::string &hostname, int port, + _truncate = false; + + 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) + 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 |
