From: Date: July 3 2009 9:04pm
Subject: bzr push into mysql-5.1-bugteam branch (kristofer.pettersson:2996 to
 2997)
List-Archive: http://lists.mysql.com/commits/77936
Message-Id: <0KM700IA8ZNTQI00@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_sSpQfHnjTRI3g9E9Zru7lQ)"

--Boundary_(ID_sSpQfHnjTRI3g9E9Zru7lQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 2997 Kristofer Pettersson	2009-07-03 [merge]
      5.0-bugteam -> 5.1-bugteam

    modified:
      client/mysql.cc
 2996 Alexey Kopytov	2009-07-03 [merge]
      Automerge.

    modified:
      mysql-test/r/type_newdecimal.result
      mysql-test/t/type_newdecimal.test
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_sum.cc
      sql/my_decimal.h
      sql/sql_select.cc
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2009-06-29 14:00:47 +0000
+++ b/client/mysql.cc	2009-07-03 11:55:45 +0000
@@ -4264,41 +4264,36 @@ com_status(String *buffer __attribute__(
   MYSQL_RES *result;
   LINT_INIT(result);
 
+  if (mysql_real_query_for_lazy(
+        C_STRING_WITH_LEN("select DATABASE(), USER() limit 1")))
+    return 0;
+
   tee_puts("--------------", stdout);
   usage(1);					/* Print version */
-  if (connected)
+  tee_fprintf(stdout, "\nConnection id:\t\t%lu\n",mysql_thread_id(&mysql));
+  /*
+    Don't remove "limit 1",
+    it is protection againts SQL_SELECT_LIMIT=0
+  */
+  if (mysql_store_result_for_lazy(&result))
   {
-    tee_fprintf(stdout, "\nConnection id:\t\t%lu\n",mysql_thread_id(&mysql));
-    /* 
-      Don't remove "limit 1", 
-      it is protection againts SQL_SELECT_LIMIT=0
-    */
-    if (!mysql_query(&mysql,"select DATABASE(), USER() limit 1") &&
-	(result=mysql_use_result(&mysql)))
+    MYSQL_ROW cur=mysql_fetch_row(result);
+    if (cur)
     {
-      MYSQL_ROW cur=mysql_fetch_row(result);
-      if (cur)
-      {
-        tee_fprintf(stdout, "Current database:\t%s\n", cur[0] ? cur[0] : "");
-        tee_fprintf(stdout, "Current user:\t\t%s\n", cur[1]);
-      }
-      mysql_free_result(result);
-    } 
-#ifdef HAVE_OPENSSL
-    if ((status_str= mysql_get_ssl_cipher(&mysql)))
-      tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
-		  status_str);
-    else
-#endif /* HAVE_OPENSSL */
-      tee_puts("SSL:\t\t\tNot in use", stdout);
+      tee_fprintf(stdout, "Current database:\t%s\n", cur[0] ? cur[0] : "");
+      tee_fprintf(stdout, "Current user:\t\t%s\n", cur[1]);
+    }
+    mysql_free_result(result);
   }
+
+#ifdef HAVE_OPENSSL
+  if ((status_str= mysql_get_ssl_cipher(&mysql)))
+    tee_fprintf(stdout, "SSL:\t\t\tCipher in use is %s\n",
+                status_str);
   else
-  {
-    vidattr(A_BOLD);
-    tee_fprintf(stdout, "\nNo connection\n");
-    vidattr(A_NORMAL);
-    return 0;
-  }
+#endif /* HAVE_OPENSSL */
+    tee_puts("SSL:\t\t\tNot in use", stdout);
+
   if (skip_updates)
   {
     vidattr(A_BOLD);
@@ -4317,8 +4312,14 @@ com_status(String *buffer __attribute__(
     tee_fprintf(stdout, "Insert id:\t\t%s\n", llstr(id, buff));
 
   /* "limit 1" is protection against SQL_SELECT_LIMIT=0 */
-  if (!mysql_query(&mysql,"select @@character_set_client, @@character_set_connection, @@character_set_server, @@character_set_database limit 1") &&
-      (result=mysql_use_result(&mysql)))
+  if (mysql_real_query_for_lazy(C_STRING_WITH_LEN(
+        "select @@character_set_client, @@character_set_connection, "
+        "@@character_set_server, @@character_set_database limit 1")))
+  {
+    if (mysql_errno(&mysql) == CR_SERVER_GONE_ERROR)
+      return 0;
+  }
+  if (mysql_store_result_for_lazy(&result))
   {
     MYSQL_ROW cur=mysql_fetch_row(result);
     if (cur)


--Boundary_(ID_sSpQfHnjTRI3g9E9Zru7lQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name*0="bzr/kristofer.pettersson@stripped";
 name*1=3184930-z5tqsali969vzjen.bundle
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename*0="bzr/kristofer.pettersson@stripped";
 filename*1=3184930-z5tqsali969vzjen.bundle

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kristofer.pettersson@stripped\
#   z5tqsali969vzjen
# target_branch: file:///Users/thek/Development/mysql-5.1-bugteam/
# testament_sha1: 02388eb8de880fba2dd32dc8bb3991a2c44b1d9c
# timestamp: 2009-07-03 21:04:41 +0200
# source_branch: file:///Users/thek/Development/51-bug44658/
# base_revision_id: alexey.kopytov@stripped\
#   pmbuhg3gv6pessx5
# 
# Begin bundle
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
t/8XckU4UJAcyDjc


--Boundary_(ID_sSpQfHnjTRI3g9E9Zru7lQ)--