Attachment 893579 Details for Bug 1088197 – diff between 5.5.36 and 5.5.37

[patch] diff between 5.5.36 and 5.5.37

patch (text/plain), 1.61 KB, created by Huzaifa S. Sidhpurwala on 2014-05-08 08:43:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Huzaifa S. Sidhpurwala

Created: 2014-05-08 08:43:09 UTC

Size: 1.61 KB

patch

obsolete

>diff -Nuar mysql-5.5.36/client/mysql.cc mysql-5.5.37/client/mysql.cc
>--- mysql-5.5.36/client/mysql.cc	2014-03-31 14:28:29.000000000 +0530
>+++ mysql-5.5.37/client/mysql.cc	2014-03-15 00:28:32.000000000 +0530
>@@ -1,5 +1,5 @@
> /*
>-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
>+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
> 
>    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
>@@ -1176,9 +1176,9 @@
> 
>   put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",
> 	   INFO_INFO);
>-  my_snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
>-	  "Your MySQL connection id is %lu\nServer version: %s\n",
>-	  mysql_thread_id(&mysql), server_version_string(&mysql));
>+  snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
>+	   "Your MySQL connection id is %lu\nServer version: %s\n",
>+	   mysql_thread_id(&mysql), server_version_string(&mysql));
>   put_info((char*) glob_buffer.ptr(),INFO_INFO);
> 
>   put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
>diff -Nuar mysql-5.5.36/client/mysql_upgrade.c mysql-5.5.37/client/mysql_upgrade.c
>--- mysql-5.5.36/client/mysql_upgrade.c	2014-01-14 13:46:26.000000000 +0530
>+++ mysql-5.5.37/client/mysql_upgrade.c	2014-03-15 00:28:32.000000000 +0530
>@@ -462,6 +462,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