Cleanups

Don't run upgrade.test with embedded server as it requires mysqlcheck


mysql-test/r/upgrade.result:
  Change database names to start with mysqltest
mysql-test/t/upgrade.test:
  Change database names to start with mysqltest
  Don't run test with embedded server as it requires mysqlcheck
sql/ha_ndbcluster.cc:
  Code style cleanups
  more dbugging
sql/ha_ndbcluster_binlog.cc:
  Free table_share properly in case of errors
  More debugging

1 files changed, 24 insertions, 21 deletions

diff --git a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test
index 826f486e4c0..42e32b686c2 100644
--- a/mysql-test/t/upgrade.test
+++ b/mysql-test/t/upgrade.test
@@ -1,28 +1,31 @@
+-- source include/not_embedded.inc
+
 --disable_warnings
-drop database if exists `testdb1`;
-drop database if exists `testdb-1`;
-drop database if exists `#mysql50#testdb-1`;
+drop database if exists `mysqltest1`;
+drop database if exists `mysqltest-1`;
+drop database if exists `#mysql50#mysqltest-1`;
 --enable_warnings
-create database `testdb1`;
-create database `#mysql50#testdb-1`;
-create table `testdb1`.`t1` (a int);
-create table `testdb1`.`#mysql50#t-1` (a int);
-create table `#mysql50#testdb-1`.`t1` (a int);
-create table `#mysql50#testdb-1`.`#mysql50#t-1` (a int);
-show create database `testdb1`;
+
+create database `mysqltest1`;
+create database `#mysql50#mysqltest-1`;
+create table `mysqltest1`.`t1` (a int);
+create table `mysqltest1`.`#mysql50#t-1` (a int);
+create table `#mysql50#mysqltest-1`.`t1` (a int);
+create table `#mysql50#mysqltest-1`.`#mysql50#t-1` (a int);
+show create database `mysqltest1`;
 --error 1049
-show create database `testdb-1`;
-show create database `#mysql50#testdb-1`;
-show tables in `testdb1`;
-show tables in `#mysql50#testdb-1`;
+show create database `mysqltest-1`;
+show create database `#mysql50#mysqltest-1`;
+show tables in `mysqltest1`;
+show tables in `#mysql50#mysqltest-1`;
 
 --exec $MYSQL_CHECK --all-databases --fix-db-names --fix-table-names
 
-show create database `testdb1`;
-show create database `testdb-1`;
+show create database `mysqltest1`;
+show create database `mysqltest-1`;
 --error 1049
-show create database `#mysql50#testdb-1`;
-show tables in `testdb1`;
-show tables in `testdb-1`;
-drop database `testdb1`;
-drop database `testdb-1`;
+show create database `#mysql50#mysqltest-1`;
+show tables in `mysqltest1`;
+show tables in `mysqltest-1`;
+drop database `mysqltest1`;
+drop database `mysqltest-1`;