Merge noir.wlan.koehntopp.de:/misc/mysql/mysql-5.0-bugteam

into  noir.wlan.koehntopp.de:/misc/mysql/mysql-5.1-bugteam


mysys/my_static.c:
  Auto merged
mysys/my_static.h:
  Auto merged