Alexander Nozdrin 5f0c09dd72 Manual merge from mysql-trunk-merge. ... Conflicts: - include/my_no_pthread.h - mysql-test/r/sp-ucs2.result - sql/log.cc - sql/sql_acl.cc - sql/sql_yacc.yy		2009-12-16 21:02:21 +03:00
..
funcs_1
ndb_backup50
ndb_backup51
ndb_backup51_data_be
ndb_backup51_data_le
parts	Bug#39893: Crash if select on a partitioned table, when partitioning is disabled	2009-01-08 15:16:44 +01:00
14897.frm
bad_gis_data.dat
binlog_transaction.000001	Bug #46998 mysqlbinlog can't output BEGIN even if the database is included in a transaction	2009-09-30 10:01:52 +08:00
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	Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables	2008-05-12 21:01:13 +05:00
bug36055.MYD	Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables	2008-05-12 21:01:13 +05:00
bug36055.MYI	Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables	2008-05-12 21:01:13 +05:00
bug37631.frm	BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1	2009-04-30 18:16:49 +05:30
bug37631.MYD	BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1	2009-04-30 18:16:49 +05:30
bug37631.MYI	BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1	2009-04-30 18:16:49 +05:30
bug40482-bin.000001	BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event	2008-12-29 17:04:10 +01:00
bug47012.ARM	Bug #47012 archive tables are not upgradeable, and server crashes	2009-11-11 13:33:29 +05:30
bug47012.ARZ	Bug #47012 archive tables are not upgradeable, and server crashes	2009-11-11 13:33:29 +05:30
bug47012.frm	Bug #47012 archive tables are not upgradeable, and server crashes	2009-11-11 13:33:29 +05:30
cacert.pem	Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"	2009-01-28 16:18:50 +02:00
charset_utf8.txt	System variable tests delivered by Folio3 (see WL4288).	2008-04-10 15:14:28 +02:00
client-cert.pem	Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"	2009-01-28 16:18:50 +02:00
client-key.pem	Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"	2009-01-28 16:18:50 +02:00
corrupt-relay-bin.000624
corrupt_t1#P#p1.MYI	Bug#35161: --myisam-recover does not work for partitioned MyISAM tables	2008-07-07 17:54:42 +02:00
corrupt_t1.MYI	Bug#35161: --myisam-recover does not work for partitioned MyISAM tables	2008-07-07 17:54:42 +02:00
des_key_file
Index.xml	Manual merge from mysql-trunk-merge.	2009-12-16 21:02:21 +03:00
init_file.dat	Bug#43587: Putting event_scheduler=1 in init SQL file crashes	2009-07-24 15:45:42 -03:00
latin1.xml	Bug#46448 trailing spaces are not ignored when user collation maps space != 0x20	2009-10-12 15:25:59 +05:30
loaddata1.dat
loaddata2.dat
loaddata3.dat
loaddata4.dat
loaddata5.dat
loaddata6.dat
loaddata_dq.dat
loaddata_pair.dat
loaddata_utf8.dat	BUG#45516 SQL thread does not use database charset properly	2009-08-12 11:54:05 +08:00
loadxml.dat	WL#1397 convert XML -> SQL	2009-10-12 11:22:53 +05:00
loadxml2.dat	WL#1397 convert XML -> SQL	2009-10-12 11:22:53 +05:00
master-bin.000001
Moscow_leap	Bug #39920: MySQL cannot deal with Leap Second expression in string literal.	2008-12-01 16:18:35 +02:00
ndb_config_config.ini
ndb_config_mycnf1.cnf
ndb_config_mycnf2.cnf
numbers.txt	System variable tests delivered by Folio3 (see WL4288).	2008-04-10 15:14:28 +02:00
old_table-323.frm
rpl_bug28618.dat	BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable	2008-07-04 11:33:34 +02:00
rpl_loaddata.dat
rpl_loaddata2.dat
rpl_mixed.dat	BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable	2008-07-04 11:33:34 +02:00
rpl_timezone.dat
rpl_timezone2.dat
server-cert.pem	Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"	2009-01-28 16:18:50 +02:00
server-key.pem	Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"	2009-01-28 16:18:50 +02:00
server8k-cert.pem	Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"	2009-01-28 16:18:50 +02:00
server8k-key.pem	Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"	2009-01-28 16:18:50 +02:00
trunc_binlog.000001
untrusted-cacert.pem
vchar.frm
warnings_loaddata.dat
words.dat
words2.dat