Alfranio Correia 40949a3110 merge mysql-next-mr --> mysql-5.1-rpl-merge ... Conflicts: Text conflict in sql/log.cc Text conflict in sql/slave.cc Text conflict in sql/sql_base.cc		2010-01-13 12:22:34 +00:00
..
examples
CMakeLists.txt
copyright
emb_qcache.cc
emb_qcache.h
embedded_priv.h
lib_sql.cc
libmysqld.c
libmysqld.def
libmysqld.rc
Makefile.am	merge mysql-next-mr --> mysql-5.1-rpl-merge	2010-01-13 12:22:34 +00:00
resource.h