mysql-test/suite/ndb/t/ndb_multi.test · mysql-5.7.9 · Rasoul Jahanshahi / Mysql Server

Apr 01, 2015

Merge mysql-5.6-cluster-7.4 commit '43e1df7891ba07fee85ea8ffce6f0479f8d8f9db'... · 0b663dcc

Magnus Blåudd authored Apr 01, 2015

Merge mysql-5.6-cluster-7.4 commit '43e1df7891ba07fee85ea8ffce6f0479f8d8f9db' into mysql-trunk-cluster

Conflicts:
	VERSION
	mysql-test/suite/ndb/r/ndbinfo.result
	sql/sql_db.cc
	storage/ndb/src/ndbapi/Ndbif.cpp

0b663dcc

Merge mysql-5.6-cluster-7.4 commit '43e1df7891ba07fee85ea8ffce6f0479f8d8f9db'...

Magnus Blåudd authored Apr 01, 2015

Merge mysql-5.6-cluster-7.4 commit '43e1df7891ba07fee85ea8ffce6f0479f8d8f9db' into mysql-trunk-cluster

Conflicts:
	VERSION
	mysql-test/suite/ndb/r/ndbinfo.result
	sql/sql_db.cc
	storage/ndb/src/ndbapi/Ndbif.cpp