From: Christopher Powers
Date: August 23 2010 2:09pm
Subject: bzr push into mysql-5.5-bugfixing branch (chris.powers:3192)
List-Archive: http://lists.mysql.com/commits/116519
Message-Id: <20100823140920.69AD41DB0318@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5877570986297192667=="

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

 3192 Christopher Powers	2010-08-23 [merge]
      merge

    added:
      mysql-test/suite/parts/r/part_ctype_utf32.result
      mysql-test/suite/parts/t/part_ctype_utf32.test
    modified:
      sql/field.cc
      sql/sql_audit.cc
      sql/sql_audit.h
      sql/sql_plugin.cc
=== modified file 'mysys/my_thr_init.c'
--- a/mysys/my_thr_init.c	2010-02-13 16:01:32 +0000
+++ b/mysys/my_thr_init.c	2010-08-23 01:41:42 +0000
@@ -302,6 +302,8 @@ void my_thread_global_end(void)
 #ifndef HAVE_GETHOSTBYNAME_R
   mysql_mutex_destroy(&LOCK_gethostbyname_r);
 #endif
+
+  my_thread_basic_global_init_done= 0;
 }
 
 static my_thread_id thread_id= 0;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/base-55-\
#   bugfixing/mysql/
# testament_sha1: 744d54e620ec81756e2b3909a55f27d55761504e
# timestamp: 2010-08-23 09:09:20 -0500
# base_revision_id: bar@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfeu6DQAA5HfgEAQWGf//1og
QAC////wYAbOXnofV99dR3TfU82R1FLy+gkkQ1MU9NEwyeinpPUeoGhkAAMkibFM0YqfkU9T0mRj
SDQABgyU02pqaA2oZNAAAAPUADEmpkTDUamjR5QaaBiNGg0GgioTQAjTJoKejCNU9INMgDQIpJpl
MmqbGmpkDyiZGQ02oANHZnprjay5cfsgbC2KdZorcEkd2xpQhFyhM4CMrk0uZouda3xtjTRh51T0
7ZJICuG4Dg4lFAMHstnlaQnmqCgGdoUPFcDwPI1udr3ooHUMPZhL4/jGlLVJ8mSnn+q6qJ4TSupH
hmwcQkjTxaTT03e9qp3dAOxveKxhq+Zmdd8B6dXF2Cu1xanNueFi+A5OOSGjDozeU6Ja12p0uFIM
F6WIu/G+cYwhRx40oZsNz2Zee8UV8HmIklCwvSiMqAAhdSkgU3QiqkirVa2MgQoKUWcx02rau2gv
x/S2u3GAWNdrsYXBO6KlN73ZoBfBu4jh6NFsmhuamcem7ba0X51ZB9dFkDShBZB/Tg5XtFfCUanb
R9HzVFn21XE5abMI8JNeND9+Xh0QnT0nsFdRy+dfNr9WS11Kmujg8xKGfa7tYZF/ORS9kZ37wqcT
pqBdPn8a4QSY275V2abHg+qF8upnuAIMG53E5BkBVJl2lLDGbGdGGWtvWhgdsW4n8NdhMviewDRn
JrskIVhZbtx1M7/UpsoTIwaymZreXaGhAhtKHOYE1hF6lyaMDmXFwF4RlAlXaMzjC2alIwG/KIg1
IoYmNSuDdpg5NC6Os1msA3SHE9OkSHInYbjMaGqC5m1T0cYAQXpaLK5BIOcDOiOuFJtz3tSXWacs
PK+rxez48BjVrfkxpTaQJYmqVIiH3rWwN3MGA6p3qcGPtwMVE1QbF+PLcvdDPZYadGDKViLFuJZl
078YQdzZk2l1JHOWd2Ftsy+uS2TI3VVF7UEG63XhWzroqKNuwIwbqdKSUZ4dQoc0LqtjE2xd0ils
YAzZEMM3NhW0yYEwmEm2jNaSasSClwGqrDK3i/QNp5sc21wgw2/KGJ0YHSaiiSKa0Agikl+dZDQu
NgFx3Yix0CutpKlDBIbAIMPShQZkBjMDLM4GN8+GMdGFbLJGeffuRbwKUuy58TeGoDz2r7+NTji1
bL8dLGjapRSWsw561Rb64sYPiNjoh4o68ce/yl7ePosV+hPNnvvtgrDftxEcQmtTIrOeyt89AUaR
tVhrquzPRs3Pk8kIhAjEIkY/285sEXC1AJu7Z81ueDMy0Ojqdb1q4trUMXvoREvnS3SKrAaCNaXf
KxTfwWkmsmwN4fyxXJVKNFqyd1dlmp73pJRNdHhs6MHvkZSNGvXQpmWrZcLIQFQRO4IioCsAWRJu
pEC7zaOHGV8uEnP2pmgiK8S+y+gxFuB8TvZlYVCKj270+zQRntKTC5CC9HnD4zk9jdVki+Xh6z4t
/ixb5T+rFTZgKZZsjBZNtvTR0DGevdDrLzCnf5zmaQGasO9uGXBtqnSyHA9TsvJ0g3jvCKTwVxlk
llFTN0gOWNXUpXw/KANQj93NL2gJrhF7l4Syfs7Rg7zlCt15hXNNZjM8gbLMK7lP4483g1t2QnKw
R+BIOanwzDDs7aOq9EPzc15vQJu8C7w2uTWGH6heDsQ1CTbEJ/2RxWwOs28fA3IsPdKho4l9tXNi
+z7rM+UiL27vofkK+67glJgu5jdEcB0e61tbQ8M3lm/XK2IPUKypBIpF2BA73ahahYtMA7AqBW0Z
BRhTyQqzaVgM1yZIVIWEPQLre+OgThrx0QDqhvA9rDo8nJuC94IsAMF6RQ9jHfVf7s/+axGfVpCl
k1/JhADxaBeOpDp8wl8BHghpc9bKoQ8ymSx2BmQPisnwTmRDkmonNcZKQ4OjILnyi2iL5bV505sT
6tYATErOLI7Ux/ebQIx7vB+zSCDTygVHA5787N4QCSV8wJghzDZWZoJBWGzXsVd5IcjuKNhcANgm
fUBEicJNrGgNAOUQxTHQ0xYsZ+cmW8ta1pk2w0BkyqdXYNFT6YKRJCTKwmyVOVZZ4TFWylsVOIuY
1bm7VzORxtECeoCOvG0HW9K4PZg2BkxoRd7K7L22tdiF7icswyZJn5Q8PN7QAvE3WEUfLWvuG+Zv
hC9/8XckU4UJD3rug0A=


--===============5877570986297192667==--