From: Marc Alff
Date: September 9 2010 8:39pm
Subject: bzr push into mysql-5.5-bugfixing branch (marc.alff:3204 to 3205) Bug#56521
List-Archive: http://lists.mysql.com/commits/117935
X-Bug: 56521
Message-Id: <20100909203935.C56F445E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7554487056058551062=="

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

 3205 Marc Alff	2010-09-09
      Bug#56521 Assertion failed: (m_state == 2), function allocated_to_free, pfs_lock.h (138)
      
      Before this fix, it was possible to build the server:
      - with the performance schema
      - with a dummy implementation of my_atomic (MY_ATOMIC_MODE_DUMMY).
      
      In this case, the resulting binary will just crash,
      as this configuration is not supported.
      
      This fix enforces that the build will fail with a compilation error in this
      configuration, instead of resulting in a broken binary.

    modified:
      storage/perfschema/ha_perfschema.cc
 3204 Marc Alff	2010-09-09 [merge]
      local merge

    modified:
      client/mysqltest.cc
      cmake/dtrace.cmake
      libmysqld/lib_sql.cc
      mysql-test/r/func_time.result
      mysql-test/r/parser.result
      mysql-test/r/select.result
      mysql-test/r/strict.result
      mysql-test/r/type_datetime.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/t/disabled.def
      mysql-test/t/strict.test
      mysql-test/t/type_datetime.test
      mysys/my_gethwaddr.c
      mysys/my_sync.c
      sql/derror.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/mysqld.cc
      sql/set_var.cc
      sql/set_var.h
      sql/sys_vars.h
=== modified file 'storage/perfschema/ha_perfschema.cc'
--- a/storage/perfschema/ha_perfschema.cc	2010-07-15 23:44:45 +0000
+++ b/storage/perfschema/ha_perfschema.cc	2010-09-09 20:28:47 +0000
@@ -19,6 +19,7 @@
 */
 
 #include "my_global.h"
+#include "my_atomic.h"
 #include "my_pthread.h"
 #include "sql_plugin.h"
 #include "mysql/plugin.h"
@@ -28,6 +29,17 @@
 #include "pfs_instr_class.h"
 #include "pfs_instr.h"
 
+#ifdef MY_ATOMIC_MODE_DUMMY
+/*
+  The performance schema can can not function with MY_ATOMIC_MODE_DUMMY,
+  a fully functional implementation of MY_ATOMIC should be used instead.
+  If the build fails with this error message:
+  - either use a different ./configure --with-atomic-ops option
+  - or do not build with the performance schema.
+*/
+#error "The performance schema needs a functional MY_ATOMIC implementation."
+#endif
+
 handlerton *pfs_hton= NULL;
 
 static handler* pfs_create_handler(handlerton *hton,


--===============7554487056058551062==
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-5.5-bugfixing-\
#   56521/
# testament_sha1: 65e1adcf51293ee624aeec9ae345ec53a32ff78b
# timestamp: 2010-09-09 14:39:35 -0600
# base_revision_id: marc.alff@stripped\
#   sfg9zyasx41oq9b1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbDgaj4AAd7fgAAQWHf/934i
hiC////wUAT3Lee252kDQAegNImk09J6TyhpmiaMg0NAAAaAaRMDSNMJI8TUAAAAAyAyQ00KnmlP
KGjCGg0aNAANMgK2po1J6aBABoAAAAAAJIiZAE0AahiZJ6jCnlNpqbQTT1OxhieTWJ9a/A3aZe0J
0tw1BfW7qULqZ0KCCHygA73OVvOadsEqnu4boZp1N8VUeACr8iaxx4zUYlwrBmd58LYurVSnGuAH
WZy5rtwXxSNkCwa6oyfESRb3MV2+uvRLNw2ulkoWWpaqmZzbFAembmyAgtJqCSF19gWuyoacAxTw
aG2GPLgCEpo1Y2tkWiYjynAMZs4DgGcYs1Lp1036JA+Hg2PBj8iObmWa3v0q7sjPaKS7G7M/YYUV
5sqqq0ia0JHOH01Vb+y26r5aSYvm3FmQo70LOoOgzUlNDlGhQQaSApgUV0EorqGaBETFoYg6XZhZ
PjmxgtDbNXC3XvDCdI3pM1sk3Hzxx1RMCsIyl5ERlfEieAnARkNlIEpYigWxZ2vWPGClPETaxP10
IiGwWBOyU9UL2jnOmog/QQpGicbicDQU2VYjPEpz3A8mPF0AVqzQGFsBTwcRyYJBwGsCt8VlDxfh
I9BE3ka7olqq4GVVBbGlG+8qLAxc6HUcFBa2IgatM587DHGYNaJV5Nd1+NJVbTdeWyuea2C2ugxq
dA91zzeS0lpUqrvms3XDCyoxPlhC65GiQzxvReUkkREBpJ0i/VxXUSuhBHHq7chI2EKJWIERPhM3
yRrLGP0dZE5RI2FipU96Uef2j9ojjXYpAeyMF7r1Pxjs3OHv9E3vE3dTYsyGF5ULm3QrHXx9u9Ii
TGtIBxWB9Uj73wzVGAU47IJFyJnxlTTrU87WUP6SiM3b6t9fFd54mjzHc1dHqYIYotwqYYjBIbzr
K/R5lS7clA/w2hH4t4Ru4Ab5wdIjWkaLTP6PQG4sKXTvqU7YFk1FN3Tim7s3cc6qeReU1Z4WaN+H
EzsjYDUQ2WSgC3GJT1yh7N9iPCtRoN++fPyHkKJvYBUKFVyopqFV110lmpSEW8asXPaiWxIkAIr8
e9VS0r8p17ipw2aZX8QNdtpCBs43q81sFihGvjoY+/SJUb9tsIpGCrc5Nt2DJEVisl/N9S4RM+oI
mPhsiEIokdGwXS9kR6QXf1CbF9Y4evg0Q9hlfIBwINLmtQaYmejgnz+OtNLu5MvDYtm7aEFDzGpM
heRX9A0UH6kffjlKSDWzJjzFuFT4A2CWTLLOqucnXYvDqDXJm5fq0KQj8oBRkyMrEh11L3sBQNbz
K7qHgUvekbrQO0Nwdx3DP1xV0lHVcVrY185EKFRKyiigambpmIeToJwIoaoGCUaAhBlzinIIGZMt
2/m2epsKU2hIoTFIB/TqJZLxUHY/5IpC1BkOm+azctdgq9TMoDhryU4RCofQToNQuInXHkLWQDdK
CbUJlFJcdlhMFF21UzoRcXcHIoKNAirRHRsEhIFACEAPnCiRjRPI+mqMjAJJoBMiV1REfCNFoQ+q
sV/2tOWN8KesvCBc+Ci072HvjvUH6Eh1CEDVDNWaaknSYGRGuVhI1bZUMnYYnhBWBcEmVmiv12ov
2lRJw0QPkrz4yyFesKQ9hTQSmsx5KxPNU49rgxkm0yJc16L/xdyRThQkLDgaj4A=


--===============7554487056058551062==--