Alexander Nozdrin ddc8765a9e Manual merge from mysql-trunk-merge. ... Conflicts: - mysql-test/suite/rpl/r/rpl_binlog_grant.result - mysql-test/suite/rpl/r/rpl_sp.result - mysql-test/suite/rpl/t/rpl_binlog_grant.test - sql/sql_parse.cc - sql/sql_table.cc - sql/sql_test.cc		2010-01-31 01:06:50 +03:00
..
funcs_1
ndb_backup50
ndb_backup51
ndb_backup51_data_be
ndb_backup51_data_le
parts
14897.frm
bad_gis_data.dat
binlog_transaction.000001
bug15328.cnf
bug16266.000001
bug19371.frm
bug19371.MYD
bug19371.MYI
bug30435_5k.txt
bug30435_10k_items.txt
bug33029-slave-relay-bin.000001
bug35469.dat
bug36055.frm
bug36055.MYD
bug36055.MYI
bug37631.frm
bug37631.MYD
bug37631.MYI
bug40482-bin.000001
bug47012.ARM
bug47012.ARZ
bug47012.frm
bug47142_master-bin.000001
cacert.pem
charset_utf8.txt
client-cert.pem
client-key.pem
corrupt-relay-bin.000624
corrupt_t1#P#p1.MYI
corrupt_t1.MYI
des_key_file
Index.xml
init_file.dat
latin1.xml
loaddata1.dat
loaddata2.dat
loaddata3.dat
loaddata4.dat
loaddata5.dat
loaddata6.dat
loaddata_dq.dat
loaddata_pair.dat
loaddata_utf8.dat
loadxml.dat
loadxml2.dat
master-bin.000001
Moscow_leap
ndb_config_config.ini
ndb_config_mycnf1.cnf
ndb_config_mycnf2.cnf
numbers.txt
old_table-323.frm
rpl_bug28618.dat
rpl_loaddata.dat
rpl_loaddata2.dat
rpl_mixed.dat
rpl_timezone.dat
rpl_timezone2.dat
server-cert.pem
server-key.pem
server8k-cert.pem
server8k-key.pem
trunc_binlog.000001
untrusted-cacert.pem
vchar.frm
warnings_loaddata.dat
words.dat
words2.dat