Attachment 894544 Details for Bug 1088197 – mariadb upstream tarball diffs between 5.5.36 and 5.5.37

[patch] mariadb upstream tarball diffs between 5.5.36 and 5.5.37

mariadb.diff (text/plain), 2.24 KB, created by Huzaifa S. Sidhpurwala on 2014-05-12 04:25:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Huzaifa S. Sidhpurwala

Created: 2014-05-12 04:25:57 UTC

Size: 2.24 KB

patch

obsolete

>diff -Naur mariadb-5.5.36/client/mysql.cc mariadb-5.5.37/client/mysql.cc
>--- mariadb-5.5.36/client/mysql.cc	2014-02-24 05:20:18.000000000 +0530
>+++ mariadb-5.5.37/client/mysql.cc	2014-04-15 16:32:39.000000000 +0530
>@@ -1,6 +1,6 @@
> /*
>-   Copyright (c) 2000, 2013, Oracle and/or its affiliates.
>-   Copyright (c) 2009, 2013, Monty Program Ab.
>+   Copyright (c) 2000, 2014, Oracle and/or its affiliates.
>+   Copyright (c) 2009, 2014, Monty Program Ab.
> 
>    This program is free software; you can redistribute it and/or modify
>    it under the terms of the GNU General Public License as published by
>diff -Naur mariadb-5.5.36/client/mysqldump.c mariadb-5.5.37/client/mysqldump.c
>--- mariadb-5.5.36/client/mysqldump.c	2014-02-24 05:20:19.000000000 +0530
>+++ mariadb-5.5.37/client/mysqldump.c	2014-04-15 16:32:30.000000000 +0530
>@@ -3991,7 +3991,13 @@
>   char *ubs;
>   char *endsemi;
>   DBUG_ENTER("dump_tablespaces");
>-
>+  
>+  /*
>+    Try to turn off semi-join optimization (if that fails, this is a
>+    pre-optimizer_switch server, and the old query plan is ok for us.
>+  */
>+  mysql_query(mysql, "set optimizer_switch='semijoin=off'");
>+ 
>   init_dynamic_string_checked(&sqlbuf,
>                       "SELECT LOGFILE_GROUP_NAME,"
>                       " FILE_NAME,"
>@@ -4151,6 +4157,8 @@
> 
>   mysql_free_result(tableres);
>   dynstr_free(&sqlbuf);
>+  mysql_query(mysql, "set optimizer_switch=default");
>+
>   DBUG_RETURN(0);
> }
> 
>diff -Naur mariadb-5.5.36/client/mysqltest.cc mariadb-5.5.37/client/mysqltest.cc
>--- mariadb-5.5.36/client/mysqltest.cc	2014-02-24 05:20:30.000000000 +0530
>+++ mariadb-5.5.37/client/mysqltest.cc	2014-04-15 16:32:39.000000000 +0530
>@@ -7916,6 +7916,7 @@
> 
>   DBUG_ENTER("handle_error");
> 
>+  command->used_replace= 1;
>   if (command->require_file)
>   {
>     /*
>diff -Naur mariadb-5.5.36/client/mysql_upgrade.c mariadb-5.5.37/client/mysql_upgrade.c
>--- mariadb-5.5.36/client/mysql_upgrade.c	2014-02-24 05:20:19.000000000 +0530
>+++ mariadb-5.5.37/client/mysql_upgrade.c	2014-04-15 16:32:39.000000000 +0530
>@@ -500,6 +500,7 @@
>   */
>   if (run_tool(tool_executable_name,
>                &ds_tmp, /* Get output from command, discard*/
>+               "--no-defaults",
>                "--help",
>                "2>&1",
>                IF_WIN("> NUL", "> /dev/null"),

Actions: View | Diff

Attachments on bug 1088197: 893579 | 893590 | 894542 | 894544