From: Date: July 3 2009 8:59pm
Subject: bzr commit into mysql-pe branch (kristofer.pettersson:3429)
List-Archive: http://lists.mysql.com/commits/77938
Message-Id: <0KM700FJ6ZEUWK30@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_U0oT4mi96ggOHxhekTgaLg)"

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

#At file:///Users/thek/Development/mysql-pe/ based on revid:alexey.kopytov@stripped

 3429 Kristofer Pettersson	2009-07-03 [merge]
      5.1-bugteam -> mysql-pe

    modified:
      client/mysql.cc
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2009-06-29 14:56:06 +0000
+++ b/client/mysql.cc	2009-07-03 18:58:44 +0000
@@ -4369,41 +4369,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);
-    } 
-#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-    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 && !EMBEDDED_LIBRARY */
-      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);
   }
+
+#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
+  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 && EMBEDDED_LIBRARY */
+    tee_puts("SSL:\t\t\tNot in use", stdout);
+
   if (skip_updates)
   {
     vidattr(A_BOLD);
@@ -4422,8 +4417,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_U0oT4mi96ggOHxhekTgaLg)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name*0="bzr/kristofer.pettersson@stripped";
 name*1=3185844-vbg4cykmfxu11kou.bundle
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename*0="bzr/kristofer.pettersson@stripped";
 filename*1=3185844-vbg4cykmfxu11kou.bundle

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kristofer.pettersson@stripped\
#   vbg4cykmfxu11kou
# target_branch: file:///Users/thek/Development/mysql-pe/
# testament_sha1: 59ebc28a554d15db05f4c88c5df4247900022e37
# timestamp: 2009-07-03 20:59:18 +0200
# source_branch: file:///Users/thek/Development/mysql-5.1-bugteam/
# base_revision_id: alexey.kopytov@stripped\
#   toiyvlbi2ca7bvtx
# 
# Begin bundle
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
bTsj/4u5IpwoSA9l8BKA


--Boundary_(ID_U0oT4mi96ggOHxhekTgaLg)--