Attachment 893590 Details for Bug 1088197 – diff between 5.5.35 and 5.5.36

[patch] diff between 5.5.35 and 5.5.36

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

(hide)

Description:

Filename:

MIME Type:

Creator: Huzaifa S. Sidhpurwala

Created: 2014-05-08 09:46:07 UTC

Size: 1.93 KB

patch

obsolete

>diff -Nuar mysql-5.5.35/client/mysql.cc mysql-5.5.36/client/mysql.cc
>--- mysql-5.5.35/client/mysql.cc	2013-11-05 12:49:26.000000000 +0530
>+++ mysql-5.5.36/client/mysql.cc	2014-03-31 14:28:29.000000000 +0530
>@@ -1176,7 +1176,7 @@
> 
>   put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",
> 	   INFO_INFO);
>-  sprintf((char*) glob_buffer.ptr(),
>+  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));
>   put_info((char*) glob_buffer.ptr(),INFO_INFO);
>diff -Nuar mysql-5.5.35/client/mysqlcheck.c mysql-5.5.36/client/mysqlcheck.c
>--- mysql-5.5.35/client/mysqlcheck.c	2013-11-05 12:49:26.000000000 +0530
>+++ mysql-5.5.36/client/mysqlcheck.c	2014-01-14 13:46:26.000000000 +0530
>@@ -1,5 +1,5 @@
> /*
>-   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
>+   Copyright (c) 2001, 2011, 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
>diff -Nuar mysql-5.5.35/client/mysql_plugin.c mysql-5.5.36/client/mysql_plugin.c
>--- mysql-5.5.35/client/mysql_plugin.c	2014-01-22 20:00:11.000000000 +0530
>+++ mysql-5.5.36/client/mysql_plugin.c	2014-03-31 14:28:29.000000000 +0530
>@@ -1,5 +1,5 @@
> /*
>-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
>+   Copyright (c) 2011, 2013, 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
>@@ -856,7 +856,7 @@
>       strncat(buff, FN_DIRSEP, sizeof(buff) - strlen(buff) - 1);
> #endif
>       buff[sizeof(buff) - 1]= 0;
>-      my_delete(opt_basedir, MYF(0));
>+      my_free(opt_basedir);
>       opt_basedir= my_strdup(buff, MYF(MY_FAE));
>     }
>   }

Actions: View | Diff

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