unknown c155c66da6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl ... into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge mysql-test/t/disabled.def: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged mysql-test/r/show_check.result: Manual merge. mysql-test/t/show_check.test: Manual merge.		2007-03-06 16:44:14 +03:00
..
ndb_backup50
ndb_backup51
14897.frm	A fix for Bug#14897 "ResultSet.getString("table.column") sometimes	2006-08-30 00:38:58 +04:00
bad_gis_data.dat	bug #22372	2006-12-06 21:47:29 +04:00
bug15328.cnf	Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence	2006-05-11 14:13:14 +02:00
bug16266.000001
bug19371.frm	Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1	2006-11-09 12:00:27 +01:00
bug19371.MYD	Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1	2006-11-09 12:00:27 +01:00
bug19371.MYI	Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1	2006-11-09 12:00:27 +01:00
cacert.pem	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0	2006-05-09 20:50:29 +03:00
client-cert.pem	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0	2006-05-09 20:50:29 +03:00
client-key.pem	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0	2006-05-09 20:50:29 +03:00
des_key_file
init_file.dat	Bug#23240 --init_file statements with NOW() reports '1970-01-01 11:00:00'as the date time	2007-02-19 14:57:54 +01:00
loaddata1.dat
loaddata2.dat
loaddata3.dat
loaddata4.dat
loaddata5.dat
loaddata6.dat	Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it)	2007-02-28 17:06:57 +04:00
loaddata_dq.dat
loaddata_pair.dat
master-bin.000001
Moscow_leap
ndb_config_mycnf1.cnf
ndb_config_mycnf2.cnf
old_table-323.frm	Added --debug-info to most clients to detect memory leaks in mysql-test-run	2006-11-21 22:32:58 +02:00
rpl_loaddata.dat
rpl_loaddata2.dat
rpl_timezone.dat
rpl_timezone2.dat
server-cert-des.pem	Bug#21868 Server crashes if encrypted certificate key provided	2006-09-25 16:44:15 +02:00
server-cert.pem	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0	2006-05-09 20:50:29 +03:00
server-key-des.pem	Bug#21868 Server crashes if encrypted certificate key provided	2006-09-25 16:44:15 +02:00
server-key.pem	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0	2006-05-09 20:50:29 +03:00
trunc_binlog.000001
untrusted-cacert.pem
vchar.frm
warnings_loaddata.dat
words.dat
words2.dat