From: Marc Alff
Date: November 16 2010 4:43am
Subject: bzr commit into mysql-trunk-wl4816 branch (marc.alff:3208)
List-Archive: http://lists.mysql.com/commits/123977
Message-Id: <201011160444.oAG4gERe002870@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7835387779605909658=="

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

#At file:///Users/malff/BZR_TREE/mysql-trunk-wl4816/ based on revid:marc.alff@stripped

 3208 Marc Alff	2010-11-16
      Merge cleanup

    modified:
      mysql-test/suite/perfschema/r/ddl_setup_objects.result
      mysql-test/suite/perfschema/t/ddl_setup_objects.test
=== modified file 'mysql-test/suite/perfschema/r/ddl_setup_objects.result'
--- a/mysql-test/suite/perfschema/r/ddl_setup_objects.result	2010-11-15 15:04:34 +0000
+++ b/mysql-test/suite/perfschema/r/ddl_setup_objects.result	2010-11-16 04:42:59 +0000
@@ -1,7 +1,7 @@
 alter table performance_schema.setup_objects add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 drop table if exists test.setup_objects;
-create table test.SETUP_OBJECTS as
+create table test.setup_objects as
 select * from performance_schema.setup_objects;
 truncate table performance_schema.setup_objects;
 select count(*) from performance_schema.setup_objects;

=== modified file 'mysql-test/suite/perfschema/t/ddl_setup_objects.test'
--- a/mysql-test/suite/perfschema/t/ddl_setup_objects.test	2010-11-15 15:04:34 +0000
+++ b/mysql-test/suite/perfschema/t/ddl_setup_objects.test	2010-11-16 04:42:59 +0000
@@ -25,7 +25,7 @@ alter table performance_schema.setup_obj
 drop table if exists test.setup_objects;
 --enable_warnings
 
-create table test.SETUP_OBJECTS as
+create table test.setup_objects as
   select * from performance_schema.setup_objects;
 
 truncate table performance_schema.setup_objects;


--===============7835387779605909658==
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:///Users/malff/BZR_TREE/mysql-trunk-wl4816/
# testament_sha1: 5db1426e09e2f847e6519c3e66398b10eb348e47
# timestamp: 2010-11-16 05:43:21 +0100
# source_branch: file:///Users/malff/BZR_TREE/mysql-trunk/
# base_revision_id: marc.alff@stripped\
#   pnp3yxjc24fwgzjz
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZ+wCwgAAgnfgAAQUGP/93IC
AAC////wUAQa96AFBtNZjCSQkMT1D1I21TamJ6R6TQzUeoaDDQ00ANAAaAAGQ0ETU09QAJk9ARgR
hMJgBFJBMk9GpjEnoagDQ0AAJKJhMmQE0aCniaanpRo00ZPRphGgCGOTqiSIFjCTaGTGIBMD4QHO
g6xJnJ4KgIBERZdfZH1DJtlGDMOaEHETnVsOa6dvfUYsigGDXZpaQ2y/Ybf4CxgjpuiUlQPwhcwM
YDGhtD7vQ/8YF2qvAWwXB5iHnNZpspNDQpjEDwwUJI6CPaxVec0MAfvM7QmDlIzAdZ9zMJVQ5i5Q
SD1XedOttsUk1CufB7ico/TFu7Jn2VAcbUwRREscLTB6DdULanrd1iSNtYiPT5NBDSFjfoDzkitQ
MDDyEWlviZho0TkRNjhQZR+IDrqPdyiXN0rKKLTS8cHGuRHockUwxGGgYoklTEJgW1yQ9gE1EibW
HKLzgqFs5IqHE/wCRJHFgr7nFEaOLukcyueIMNxYBnD2AkfoCwqHFrrplgGzOY3PLCA5j7xpdAOB
K5sz8gW1LqB1JBLwGrStQgMJhHvvaWJmZlw4FNmBKxoZSjdMq6AFwY7gszmPyMImpImO1WWMwhje
No0wfWbIxFWxOjMEZopaUozRxce3TXEbJRG0k38jjeLXnqiGIj3liMJ0Go8AfHbkJ4aGjg3jBtha
fOxExu9CXE1x6z25mJnJH1EvWpg6Xt/vMSyS5jaAyAzADxwcMPBM0t4j/Yb/AECHk7pZJKH5RtP3
XcnKnDZzGCWvESwwNANBjeV/1JE23BAHDXIbE89RjDcOcc1oLsBbt8eTuMGHMaAeXWnYR0HKm/3M
E49h+ehOrK0SOD9BcXAR2jyn0suyTk1+XxyuezYOIrsmDGu/j2Z8saGKqAISZJsWs1lmknFu3Enb
wIFisTiciZNxeWovA74i+EbpANMUynmFQaEQNlZo6/qGo2qYnGvBFX3ZpfqRcje4t/kbwPA4o23d
gG5mqPnYLaI9BVwcBdy8uEmgz57JLd1KeglNGBgmHW3KkfnLc0IBB5yBl5FEEPbjH1RcM8BTJ3YB
yN4FuCtKdMx/C96Vtkm3et3WmoDZfBATs1FNyVz05XY4NShlOr8F5JZVZWtpwks23uc5ikNQVdKZ
aLCxNOCGEQy/VqIIYyfW7PVo5DT3DIc4wHUa8VvwQy5UJouDPUB9gaYgTAgZ/YOU5ZATsYpIvAgj
Ynqh6JXjC3FFPAJDNijN/i7kinChIT9gFhA=


--===============7835387779605909658==--