From: Marc Alff
Date: July 16 2010 1:18am
Subject: bzr commit into mysql-trunk-bugfixing branch (marc.alff:3118) Bug#53617
List-Archive: http://lists.mysql.com/commits/113718
X-Bug: 53617
Message-Id: <20100716011848.2CD6E45E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6106110226747656523=="

--===============6106110226747656523==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-cleanup/ based on revid:marc.alff@stripped

 3118 Marc Alff	2010-07-15
      Bug#53617 Missing performance schema tables not reported in the server log at startup
      
      Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)

    modified:
      storage/perfschema/pfs_engine_table.cc
=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-07-16 00:50:39 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-07-16 01:18:44 +0000
@@ -108,7 +108,12 @@ void PFS_check_intact::report_error(uint
   my_vsnprintf(buff, sizeof(buff), fmt, args);
   va_end(args);
 
-  my_message(code, buff, MYF(0));
+  /*
+    This is an install/upgrade issue:
+    - do not report it in the user connection, there is none in main(),
+    - report it in the server error log.
+  */
+  sql_print_error("%s", buff);
 }
 
 /**
@@ -139,6 +144,9 @@ void PFS_engine_table_share::check_one_t
       m_checked= true;
     close_thread_tables(thd);
   }
+  else
+    sql_print_error(ER(ER_WRONG_NATIVE_TABLE_STRUCTURE),
+                    PERFORMANCE_SCHEMA_str.str, m_name.str);
 
   lex_end(&dummy_lex);
   thd->lex= old_lex;


--===============6106110226747656523==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   cleanup/
# testament_sha1: 68ccc62a306bb5433a495be64378c98f1b4fbd7a
# timestamp: 2010-07-15 19:18:48 -0600
# base_revision_id: marc.alff@stripped\
#   1jzrudthkgb20m6e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRk65IgAAb3/gEAQQABad///
e+ffgL////BQBAbwAy13YAA0Qhop6nhMmJpkQ0ZNBoANNHkZMoaCEjQg/UJpoMRo9QAANANAMgyA
0gjQTIGjINDQAAAAAAA4yZMmIxMAJkwTIAaMIwBDAJJBBpomIyAENTEmaj1HqNAeoNHqNNPUSBuf
pxg90nmJqKY4/dEtFE+MOT0yAgiIIMLNC8IACCAqtcUJ9azMysrFymjBmaXcyJVJYqbhu2ywZ4UY
ouGDcpBzPNpCAoNLeIn2DmXQ66yEBonUVEhso1BT8T0D7Rrkm+SWRhdjowHfo7w6+c/LlV0qzJwn
7jIWSuWLjgI7OrVSq+B/fp2OONPDaV2pHJJY+3MunHG32S6u9nVpO9HOXNhDd6EywTCfGAOWFZRC
LhEa13ruFYoBvodK8VgrFaEanVxhxrQvcyheWy4VSKUzCjQ1JFaK6DXqtPuMlOFCd9Vu+dt7INfh
AW9ieDY/8tEdWKcMhMoT3KqOdqp0bm2QdDqvjfvREG0m1jTs+W2bPUix9ec9z6e6ZcSFmDhUs6eI
nrEaDEyJVIjext9pCG8G1eV20lKrEa7Ve65kjVpUcSezljiqrysqO1dqjNthyFscxiI5Dyw1Ohlm
++9VTpWit4rCh1O4nUrsK3Z3UNlCZmtZgW4tVYY2sOuFjTF7jCbyzBqKESeUUPTUtQUAaZPQO4Py
Ouc8gSc+mfCRCyqs3W+MyMaz1cjVlvguvRadVm9pxUOdTz0N+C5m3auI2L3Utk3he2OtXtXtkxWW
Ycx4yGXUGP2iX0KJQwzRD6PpR7z3+PrYHnz/EFbPQ8LvgkedeI0Sy7Om8kiDhBR1GDkoY+RSwfJm
GdEA2iOBdc4ZSDy7BGHJH4cbmNqupt2fO927eYuYFfJIxx3qC01aSjB0rFQJkhaIHgI7Ixk/NqVV
0CoAjXM2840R2w5AZlE5TeCEiIBCTyUPs5RBMihw5l4lbDzb0Ch8aS/aBwIwWRAyYo1wBlyQ95nz
3Ew0yT9x1dFqN+xxFCs4skTPnwx5JaL3lzYp7+uNjO/pckQ2CiqsBYmYZqx44PFltWAcXl5Z2700
OBtTjJGnUGanh8aLTz26qbKgpxbmHg5eq69GFXPrcu5bN7NatoRfwF6KvgEQc4HlguzoqkhwzvHi
ha+lmRZP2JFyaEBuO8PifyM7lBWj8DdKEDpIdRBkRRnGBAIMtjqXq1OwIUqEWYYGZUuWfPpdpTbA
VCLe58EeqRUFYd6HKku0ab9LMnD35xbNodWpWPzJdu5E6VZrY0J6ckdzByiCgyL1Li4gp3FQS0wh
kqFQDNLWqiB4Citqf62KjG18d+WERjjhVYDvsXbNc+PyVn5aJEXQtD7Sdr89dYxkPlx2J708rVkk
+q+BkwWLBSnTadlNgWpk2RQ5SdJlHh8G2wNFXZTY9RMg8V5K2AmuiHQUFkLosqToKmS9y/8XckU4
UJAZOuSI


--===============6106110226747656523==--