Alexey Kopytov d95c1e3b47 Manual merge of mysql-trunk into mysql-trunk-merge. ... Conflicts: Text conflict in client/mysqlbinlog.cc Text conflict in mysql-test/Makefile.am Text conflict in mysql-test/collections/default.daily Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test Text conflict in mysys/charset.c Text conflict in sql/field.cc Text conflict in sql/field.h Text conflict in sql/item.h Text conflict in sql/item_func.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysqld.cc Text conflict in sql/rpl_utility.cc Text conflict in sql/rpl_utility.h Text conflict in sql/set_var.cc Text conflict in sql/share/Makefile.am Text conflict in sql/sql_delete.cc Text conflict in sql/sql_plugin.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in storage/example/ha_example.h Text conflict in storage/federated/ha_federated.cc Text conflict in storage/myisammrg/ha_myisammrg.cc Text conflict in storage/myisammrg/myrg_open.c		2010-03-24 18:03:44 +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
bug48265.frm	BUG#48265 - MRG_MYISAM problem (works in 5.0.85, does't	2010-03-03 14:49:03 +04:00
bug48449.frm	Bug#48449: hang on show create view after upgrading when view contains function of view	2010-02-10 16:11:08 -02:00
bug49823.CSM	Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL	2010-02-26 09:22:48 -03:00
bug49823.CSV	Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL	2010-02-26 09:22:48 -03:00
bug49823.frm	Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL	2010-02-26 09:22:48 -03:00
cacert.pem	Bug #50642 : ssl certs in test suite are expiring soon.	2010-01-29 15:55:46 +02:00
charset_utf8.txt
client-cert.pem	Bug #50642 : ssl certs in test suite are expiring soon.	2010-01-29 15:55:46 +02:00
client-key.pem	Bug #50642 : ssl certs in test suite are expiring soon.	2010-01-29 15:55:46 +02:00
corrupt-relay-bin.000624
corrupt_t1#P#p1.MYI
corrupt_t1.MYI
des_key_file
Index.xml	Backporting WL#1213	2010-02-24 13:15:34 +04:00
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	Bug #50642 : ssl certs in test suite are expiring soon.	2010-01-29 15:55:46 +02:00
server-key.pem	Bug #50642 : ssl certs in test suite are expiring soon.	2010-01-29 15:55:46 +02:00
server8k-cert.pem	Bug #50642 : ssl certs in test suite are expiring soon.	2010-01-29 15:55:46 +02:00
server8k-key.pem	Bug #50642 : ssl certs in test suite are expiring soon.	2010-01-29 15:55:46 +02:00
trunc_binlog.000001
untrusted-cacert.pem
vchar.frm
warnings_loaddata.dat
words.dat
words2.dat