Sergei Golubchik 853077ad7e Merge branch '10.0' into bb-10.1-merge ... Conflicts: .bzrignore VERSION cmake/plugin.cmake debian/dist/Debian/control debian/dist/Ubuntu/control mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.result mysql-test/r/null.result mysql-test/r/old-mode.result mysql-test/r/union.result mysql-test/t/join_outer.test mysql-test/t/null.test mysql-test/t/old-mode.test mysql-test/t/union.test packaging/rpm-oel/mysql.spec.in scripts/mysql_config.sh sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/item_cmpfunc.h sql/lock.cc sql/sql_select.cc sql/sql_show.cc sql/sql_update.cc sql/sql_yacc.yy storage/innobase/buf/buf0flu.cc storage/innobase/fil/fil0fil.cc storage/innobase/include/srv0srv.h storage/innobase/lock/lock0lock.cc storage/tokudb/CMakeLists.txt storage/xtradb/buf/buf0flu.cc storage/xtradb/fil/fil0fil.cc storage/xtradb/include/srv0srv.h storage/xtradb/lock/lock0lock.cc support-files/mysql.spec.sh		2014-12-02 22:25:16 +01:00
..
client.c	Merge branch '10.0' into bb-10.1-merge	2014-12-02 22:25:16 +01:00
client_plugin.c	10.0-base merge	2013-01-31 09:48:19 +01:00
my_time.c	5.5.38 merge	2014-06-06 00:07:27 +02:00
my_user.c	support DEFINER=role and DEFINER=current_role	2013-10-18 12:17:49 -07:00
mysql_async.c	Fixing AIX compilation failires	2014-02-27 19:44:00 +04:00
pack.c	10.0-base merge	2014-02-26 15:28:07 +01:00