diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-10-23 17:12:12 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-10-28 05:45:36 +0700 |
| commit | 58275bd2a03fe541f1f7c4852c1828c34f32ab5f (patch) | |
| tree | 365a35c55279be45319b754a176bfa10d3610ea5 | |
| parent | 723a78e3488d101c908681587b58ef2b589392e5 (diff) | |
development/mysql-workbench: Updated for version 6.3.8.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | development/mysql-workbench/copytable.patch | 18 | ||||
| -rw-r--r-- | development/mysql-workbench/mysql-workbench.SlackBuild | 8 | ||||
| -rw-r--r-- | development/mysql-workbench/mysql-workbench.info | 6 |
3 files changed, 28 insertions, 4 deletions
diff --git a/development/mysql-workbench/copytable.patch b/development/mysql-workbench/copytable.patch new file mode 100644 index 000000000000..fbdd928bc822 --- /dev/null +++ b/development/mysql-workbench/copytable.patch @@ -0,0 +1,18 @@ +--- mysql-workbench-community-6.3.8-src/plugins/migration/copytable/copytable.cpp.orig 2016-10-23 15:39:11.356781884 +0700 ++++ mysql-workbench-community-6.3.8-src/plugins/migration/copytable/copytable.cpp 2016-10-23 15:39:36.864471189 +0700 +@@ -2847,14 +2847,7 @@ + // 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 ++ ret_length += mysql_real_escape_string(_mysql, buffer + length, data, (unsigned long)dlength); + + if( ret_length != (unsigned long) -1) + length += ret_length; diff --git a/development/mysql-workbench/mysql-workbench.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild index 29b4858850be..7bd0f88243b4 100644 --- a/development/mysql-workbench/mysql-workbench.SlackBuild +++ b/development/mysql-workbench/mysql-workbench.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=mysql-workbench PRGNAM2=antlr -VERSION=${VERSION:-6.3.7} +VERSION=${VERSION:-6.3.8} ANTLRVER=3.5.2 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -93,6 +93,12 @@ patch -p1 < $CWD/mysql-workbench-gnome-keyring.patch patch -p1 < $CWD/mysql-workbench-no-json.patch +# Self-made patch +# Used to avoid differences between MariaDB and MySQL 5.7 +# mysql_real_escape_string_quote is available in MySQL 5.7.6 and above +# https://dev.mysql.com/doc/refman/5.7/en/mysql-real-escape-string-quote.html +patch -p1 < $CWD/copytable.patch + install -D $CWD/$PRGNAM2-$ANTLRVER-complete.jar $TMP/linux-res/bin/$PRGNAM2-$ANTLRVER-complete.jar # make cmake happy with mariadb diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info index 9174b08b81fb..41bfc0e4ac99 100644 --- a/development/mysql-workbench/mysql-workbench.info +++ b/development/mysql-workbench/mysql-workbench.info @@ -1,9 +1,9 @@ PRGNAM="mysql-workbench" -VERSION="6.3.7" +VERSION="6.3.8" HOMEPAGE="https://www.mysql.com/downloads/workbench/" -DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.3.7-src.tar.gz \ +DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.3.8-src.tar.gz \ http://www.antlr3.org/download/antlr-3.5.2-complete.jar" -MD5SUM="385987776b63ad9a1c9389a9da07a6c5 \ +MD5SUM="3c4b773181c14ba4754a6af81513e2fd \ acfa69f928a0f1653555bda73091efca" DOWNLOAD_x86_64="" MD5SUM_x86_64="" |