1. 04 Dec, 2014 30 commits
  2. 03 Dec, 2014 6 commits
  3. 02 Dec, 2014 4 commits
    • Sergei Golubchik's avatar
      1caee393
    • Sergei Golubchik's avatar
      Merge branch '10.0' into bb-10.1-merge · 853077ad
      Sergei Golubchik authored
      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
      853077ad
    • Sergei Golubchik's avatar
      put at least some output-generating statement in the test · 2b5db1d5
      Sergei Golubchik authored
      otherwise mysqltest complains "No queries executed but non-empty result file found!"
      2b5db1d5
    • Sergei Golubchik's avatar
      fix include/not_embedded.inc to be independent from the environment · b3aed01a
      Sergei Golubchik authored
      in particular, not fail with --vertical_results
      b3aed01a