From: Marc Alff
Date: March 8 2010 4:12pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3116) Bug#51832
List-Archive: http://lists.mysql.com/commits/102594
X-Bug: 51832
Message-Id: <20100308161216.5354545E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1493720263421215682=="

--===============1493720263421215682==
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-51832/ based on revid:alik@stripped

 3116 Marc Alff	2010-03-08
      Bug#51832 mysql_upgrade failing on performance_schema tables in mysql-trunk
      
      Before this fix, client tools (mysql_upgrade, mysqlcheck, mysqldump)
      would try to process performance schema tables, leading to failures.
      
      The fix is to align FIRST_PERFORMANCE_SCHEMA_VERSION to 5.5.3,
      which is the version number of mysql-trunk where the
      performance schema is first available.

    modified:
      client/client_priv.h
=== modified file 'client/client_priv.h'
--- a/client/client_priv.h	2010-02-17 12:15:07 +0000
+++ b/client/client_priv.h	2010-03-08 16:12:12 +0000
@@ -101,7 +101,7 @@ enum options_client
 /**
   First mysql version supporting the performance schema.
 */
-#define FIRST_PERFORMANCE_SCHEMA_VERSION 50599
+#define FIRST_PERFORMANCE_SCHEMA_VERSION 50503
 
 /**
   Name of the performance schema database.


--===============1493720263421215682==
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-51832/
# testament_sha1: af3746310c0eb9aff10bea63482ada8375f340e3
# timestamp: 2010-03-08 09:12:16 -0700
# base_revision_id: alik@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQifxD4AAavfgEAQWWf//3tj
3QC////wUARtt3h3V3Vl11J3brgkkmKaNomp6GmImpso9NQ9Rmp6mmhk0yAEoiCeSnp6amSfqGo0
aDIAAA0ABU9GqNoR6RkaBhAaaGjINHommgaBIkjRJ6o9J+mUxqnqfpI08o8U9Q2oGTRoaAJJATIJ
qbVPU9RtMptGo9TTTQ9IA0GBJZu+nRqzN4dhyn0TxThlJr8173sgwlTNC/m67H85fnSdGhgAndKn
kVQJlw8CiKh2VlToMI1ltgGRBEmK7RWww24Ylo9j61q2qaDXKQKxgyhWGNrnxspjmv48l8pVaJo1
K/lRGZq5hFezz3qf0s2W00ZbbCgRdNsFHC9i7Oblk9FVVC4owSo1gxfxPQS80vejHmmjKONJEWNr
0pDEQs2WiSBlUYdQhIsWp7hSMht42g9d4rRGDpJh5HqpcKQuSw1XvxOvEbiIFICiZxPh7rDfliOf
UsNsBMmxRMTS4kK0glnYoXxmEMGBziXko0ecuaY9Bjaq1fpO4fU1lDRVUVhYYkC8oeI8q1gwxumQ
kSMtiZYEigYQ/aSQj2OtJX2LZ3db8Va0mE2CsJY7NQuFVBkVQmuNGBBaF/sQGt+W3JB1hbzdXLiV
SwpjNJxJGdK1wlDSAjpSoK0mxGPQLChpqzmAatyUkZDzHtHEWKoqI8myvYrUIFwRvOKmYXNjL1tA
sPVdQXQjP8zh7JTgm4l1JRxXeGHPQNj7nb8DwJd52ngf0qd44mdo8tMe87jvJHiSIjEB5MLDB54k
zIaFjeJqNPGijyv4kj7phvJgxr1kjz8qqzuNu5BMvHBccNx9Etmvgdmgwoq5cN8EsRMrevpPiWEe
wxqdziGX7ixbQpcyXMrDx8+kzvbw6dSyv1uStjWxDBIfGe3uLNp3ExUnpsgn6SoyHi68a7PV9i+V
r5vwYDtsYgSZw/VgW3v/JZ6/UfovpU57yIZrhbTGLQmYE77xI72ocmVMxSqaUYhqwXYsEU4PJzQt
H1F12yjpwLU/Rq06F+3CyKnZNLcbRw8xAxP5zzKstOx+dQXTuVJwmbRSsjA/eo338E+lPEIUXlZj
1u2kN/Osyinox4jSoefBqR4CzIkbh2043LddsBiZyEAhhKnhshPSgqi1moCNlypJ2eQ9u5dGDY86
t5s4bsMF41VA31ONtiUK+Ry1JcSaICbrzbL6Z0JG1ejZcvD8nJOSuvH8txrulK0z5H+bmYp8KOYo
De9hROW0JInFyfkvbRcz0EWRRyfvDIh5Fxb6AVhFkuiyxHkk4KpfByx7tO4GoMMMF1wNXxFxnKA0
kCp0eCjKQ3f2iv6HxRJX7am0JYyKJnFBs4EzeeMwlsbrbVRrgpgjKid6YOCGtiLEVeJ7mPZEjncO
URmeVo3HFh5LW0oqWwyvBKtVOsOkHku8WM3rXQaLaikOszGSLZEmWWYclIJhzJ7iDLBxedXXTnnC
oTWkddAqvkVzqmPLOB1G/twMXVBvYtxYLfWcudKhqbgzm2VpdA7EtYrrZGaMsFi/4u5IpwoSARP4
h8A=


--===============1493720263421215682==--