Alexander Nozdrin dabd4a1c55 Manual merge from mysql-trunk. ... Conflicts: - mysql-test/r/partition.result - mysql-test/r/variables_debug.result - mysql-test/t/partition.test - mysql-test/t/variables_debug.test		2010-05-20 16:35:28 +04:00
..
client.c
Makefile.am
my_time.c
my_user.c
pack.c