unknown f296bb095d Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 ... into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b: Auto merged BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868: Auto merged BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434: Auto merged BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8: Auto merged BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4: Auto merged client/mysql.cc: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6: Auto merged BitKeeper/deleted/.del-NOTES~e926d3e6929ac052: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqltest.c: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/ndb_condition_pushdown.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/std_data/cacert.pem: Auto merged mysql-test/std_data/client-cert.pem: Auto merged mysql-test/std_data/client-key.pem: Auto merged mysql-test/std_data/server-cert.pem: Auto merged mysql-test/std_data/server-key.pem: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/having.test: Auto merged mysql-test/t/information_schema.test: Auto merged mysql-test/t/ndb_condition_pushdown.test: Auto merged sql/item_func.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql-common/client.c: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged storage/ndb/include/util/NdbSqlUtil.hpp: Auto merged storage/ndb/src/common/util/NdbSqlUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged vio/vio.c: Auto merged client/client_priv.h: manual merge include/violite.h: Automatic mysql-test/Makefile.am: manual merge mysql-test/r/mysqldump.result: Automatic mysql-test/r/rpl_user_variables.result: Manual merge (diff is because lars removed displaying of binlog) mysql-test/t/disabled.def: manual merge mysql-test/t/mysqldump.test: manual merge mysql-test/t/rpl_user_variables.test: manual merge (Changes becasue of lars removed binlog logging) sql/mysqld.cc: manual merge vio/viossl.c: manual merge vio/viosslfactories.c: manual merge client/client_priv.h.rej: merge 5.0 -> 5.1		2006-05-09 20:50:29 +03:00
..
ndb_backup50	added missing files	2006-04-21 02:05:27 +02:00
ndb_backup51	modified ndb backup/restore to be byte order independant	2006-04-25 14:02:15 +02:00
bug16266.000001	Fix for BUG#16266: Definer is not fully qualified error during replication.	2006-03-01 14:13:07 +03: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
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	WL#1012: All changes as one single changeset.	2005-12-22 06:39:02 +01: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.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	Add an untrusted cacert used when testing	2006-05-03 14:10:22 +02:00
vchar.frm
warnings_loaddata.dat
words.dat
words2.dat	WL#1012: All changes as one single changeset.	2005-12-22 06:39:02 +01:00