Commit e7cc5bc3 authored by unknown's avatar unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/home/my/mysql-5.1


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_compress.c:
  Auto merged
mysys/my_conio.c:
  Auto merged
mysys/my_quick.c:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_map.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/stacktrace.c:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/compiler_warnings.supp:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Use remote version
parents 72253445 8449dd57
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment