unknown 5fab3969af Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge ... into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge BitKeeper/deleted/.del-im_check_os.inc: Auto merged BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Auto merged BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Auto merged BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Auto merged include/mysql_com.h: Auto merged mysql-test/lib/mtr_io.pl: Auto merged mysql-test/r/im_daemon_life_cycle.result: Auto merged mysql-test/r/im_life_cycle.result: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/type_varchar.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/im_life_cycle.imtest: Auto merged mysql-test/t/im_utils.imtest: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/trigger.test: Auto merged mysql-test/t/type_varchar.test: Auto merged mysql-test/t/view.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_row.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/mysql_priv.h: Auto merged sql/net_serv.cc: Auto merged sql/protocol.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.h: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/mysql-test-run.pl: Use local. Alik will merge his changes manually. mysql-test/lib/mtr_process.pl: Use local. mysql-test/r/grant.result: Use local. mysql-test/r/sp.result: Use local. mysql-test/r/ps.result: Manual merge. mysql-test/t/grant.test: Manual merge. mysql-test/t/ps.test: Manual merge. mysql-test/t/sp.test: Manual merge. sql/Makefile.am: Manual merge. sql/field.cc: Manual merge. sql/mysqld.cc: Manual merge. sql/share/errmsg.txt: Manual merge. sql/sp.cc: Manual merge. sql/sp_head.h: Manual merge. sql/sql_trigger.cc: Manual merge. sql/sql_view.cc: Manual merge.		2006-08-30 03:00:19 +04: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
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
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	A fix and a test case for Bug#17843 "Certain stored procedures fail to	2006-07-04 23:46:15 +04:00
loaddata1.dat
loaddata2.dat
loaddata3.dat
loaddata4.dat
loaddata5.dat
loaddata_dq.dat
loaddata_pair.dat
master-bin.000001
Moscow_leap
ndb_config_mycnf1.cnf
ndb_config_mycnf2.cnf
rpl_loaddata.dat
rpl_loaddata2.dat
rpl_timezone.dat
rpl_timezone2.dat
server-cert.pem	Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0	2006-05-09 20:50:29 +03: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