bzr commit into mysql-5.6-next-mr branch (alik:2936) Bug#48915

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/ipv6/mysql-next-mr-alik-bug4895/ based on revid:horst.hunger@stripped

 2936 Alexander Nozdrin	2009-12-01
      A patch for Bug#48915 (After having switched off the ipv6 support in OS,
      mysqld crashed in network_init()).
      
      The problem was that current_thd was not ready at that point in mysqld life,
      so ER() macro could not be used.
      
      The fix is to use ER_DEFAULT() macro, which is intented for such cases.

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-11-25 10:53:23 +0000
+++ b/sql/mysqld.cc	2009-12-01 16:59:31 +0000
@@ -1670,7 +1670,7 @@ static void network_init(void)
     if (error != 0)
     {
       DBUG_PRINT("error",("Got error: %d from getaddrinfo()", error));
-      sql_perror(ER(ER_IPSOCK_ERROR));		/* purecov: tested */
+      sql_perror(ER_DEFAULT(ER_IPSOCK_ERROR));  /* purecov: tested */
       unireg_abort(1);				/* purecov: tested */
     }
 
@@ -1684,7 +1684,7 @@ static void network_init(void)
     if (ip_sock == INVALID_SOCKET)
     {
       DBUG_PRINT("error",("Got error: %d from socket()",socket_errno));
-      sql_perror(ER(ER_IPSOCK_ERROR));		/* purecov: tested */
+      sql_perror(ER_DEFAULT(ER_IPSOCK_ERROR));  /* purecov: tested */
       unireg_abort(1);				/* purecov: tested */
     }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]