4127 magnus.blaudd@stripped 2012-11-28 [merge]
Merge 7.1 -> 7.2
4126 magnus.blaudd@stripped 2012-11-28 [merge]
Merge
removed:
mysql-test/include/ndb_have_online_alter.inc
modified:
mysql-test/suite/ndb/t/ndb_add_partition.test
mysql-test/suite/ndb/t/ndb_addnode.test
mysql-test/suite/ndb/t/ndb_alter_table_online.test
mysql-test/suite/ndb/t/ndb_alter_table_online2.test
mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test
mysql-test/suite/ndb/t/ndb_database.test
mysql-test/suite/ndb/t/ndb_native_default_support.test
mysql-test/suite/ndb_binlog/t/ndb_binlog_multi.test
mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test
mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test
mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.h
sql/ha_ndbcluster_binlog.cc
storage/ndb/CMakeLists.txt
4125 magnus.blaudd@stripped 2012-11-28 [merge]
Merge
modified:
configure.cmake
storage/ndb/CMakeLists.txt
=== removed file 'mysql-test/include/ndb_have_online_alter.inc'
--- a/mysql-test/include/ndb_have_online_alter.inc 2011-04-20 12:53:27 +0000
+++ b/mysql-test/include/ndb_have_online_alter.inc 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-#
-# Check if the MySQL Server have support for
-# ALTER [ONLINE|OFFLINE] TABLE syntax
-#
---disable_query_log
---disable_result_log
-let $have_online_alter = 1;
-CREATE TABLE check_online_alter(a int primary key);
---error 0,ER_PARSE_ERROR, ER_NOT_SUPPORTED_YET
-ALTER ONLINE TABLE check_online_alter ADD COLUMN b int;
-if (`SELECT '$mysql_errno' = '1064'`)
-{
- let $have_online_alter= 0;
-}
-
-# Cleanup
-DROP TABLE check_online_alter;
-
---enable_query_log
---enable_result_log
-
-if (!$have_online_alter)
-{
- skip Need ALTER ONLINE syntax;
-}
=== modified file 'mysql-test/suite/ndb/t/ndb_add_partition.test'
--- a/mysql-test/suite/ndb/t/ndb_add_partition.test 2012-03-21 17:28:20 +0000
+++ b/mysql-test/suite/ndb/t/ndb_add_partition.test 2012-11-27 12:53:59 +0000
@@ -1,4 +1,3 @@
---source include/ndb_have_online_alter.inc
--source include/have_ndb.inc
--disable_warnings
=== modified file 'mysql-test/suite/ndb/t/ndb_addnode.test'
--- a/mysql-test/suite/ndb/t/ndb_addnode.test 2012-03-21 17:28:20 +0000
+++ b/mysql-test/suite/ndb/t/ndb_addnode.test 2012-11-27 12:53:59 +0000
@@ -1,4 +1,3 @@
---source include/ndb_have_online_alter.inc
-- source include/have_ndb.inc
-- source include/not_embedded.inc
--result_format 2
=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online.test 2012-06-21 10:12:34 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online.test 2012-11-27 12:53:59 +0000
@@ -7,7 +7,6 @@
# Date 2006-08-28
# Purpose: Add more testing for online alter
##############################################################
---source include/ndb_have_online_alter.inc
--source include/have_multi_ndb.inc
--disable_warnings
=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online2.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online2.test 2011-12-16 07:55:55 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online2.test 2012-11-27 12:53:59 +0000
@@ -8,7 +8,6 @@
# Purpose: Add testing for online alter w/partitions
# and some original test cleanup and additions
##############################################################
---source include/ndb_have_online_alter.inc
-- source include/have_multi_ndb.inc
# test uses mysqlslap, hence not in embedded
-- source include/not_embedded.inc
=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test 2011-06-23 13:16:06 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_online_multi.test 2012-11-27 12:53:59 +0000
@@ -1,5 +1,4 @@
-- source include/not_embedded.inc
--- source include/ndb_have_online_alter.inc
-- source include/have_multi_ndb.inc
--echo *******************************
=== modified file 'mysql-test/suite/ndb/t/ndb_database.test'
--- a/mysql-test/suite/ndb/t/ndb_database.test 2011-02-02 10:33:25 +0000
+++ b/mysql-test/suite/ndb/t/ndb_database.test 2012-11-27 12:53:59 +0000
@@ -1,4 +1,3 @@
---source include/ndb_have_online_alter.inc
-- source include/have_ndb.inc
--disable_warnings
=== modified file 'mysql-test/suite/ndb/t/ndb_native_default_support.test'
--- a/mysql-test/suite/ndb/t/ndb_native_default_support.test 2011-05-09 08:49:19 +0000
+++ b/mysql-test/suite/ndb/t/ndb_native_default_support.test 2012-11-27 12:53:59 +0000
@@ -3,7 +3,6 @@
# Date: 2008-12
# Purpose: ndb native default support test
##############################################################
---source include/ndb_have_online_alter.inc
-- source include/have_ndb.inc
-- source include/ndb_default_cluster.inc
=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_multi.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_multi.test 2011-03-28 14:11:09 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_multi.test 2012-11-27 12:53:59 +0000
@@ -1,4 +1,3 @@
---source include/ndb_have_online_alter.inc
-- source include/have_multi_ndb.inc
-- source include/have_binlog_format_mixed_or_row.inc
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test 2011-05-18 12:56:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test 2012-11-27 12:53:59 +0000
@@ -1,5 +1,4 @@
--source include/have_ndb.inc
---source include/ndb_have_online_alter.inc
--source suite/ndb_rpl/ndb_master-slave.inc
#
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test 2012-11-06 08:31:04 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test 2012-11-27 12:53:59 +0000
@@ -1,5 +1,4 @@
--source include/have_ndb.inc
---source include/ndb_have_online_alter.inc
#error message differs slightly with statement based replication
--source include/have_binlog_format_mixed_or_row.inc
--source suite/ndb_rpl/ndb_master-slave.inc
=== modified file 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test'
--- a/mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test 2011-12-23 17:26:24 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_ddl_open_trans.test 2012-11-27 12:53:59 +0000
@@ -1,5 +1,4 @@
--source include/have_ndb.inc
---source include/ndb_have_online_alter.inc
--source suite/ndb_rpl/ndb_master-slave.inc
--source suite/ndb/t/ndb_ddl_open_trans.test
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc 2012-11-23 13:10:22 +0000
+++ b/sql/ha_ndbcluster.cc 2012-11-27 12:53:59 +0000
@@ -343,7 +343,6 @@ ndbcluster_partition_flags()
HA_CAN_PARTITION_UNIQUE | HA_USE_AUTO_PARTITION);
}
-#ifndef NDB_WITHOUT_ONLINE_ALTER
static uint
ndbcluster_alter_table_flags(uint flags)
{
@@ -352,32 +351,6 @@ ndbcluster_alter_table_flags(uint flags)
else
return (HA_PARTITION_FUNCTION_SUPPORTED);
}
-#else
-static uint
-ndbcluster_alter_table_flags(uint flags)
-{
- const uint f=
- HA_INPLACE_ADD_INDEX_NO_READ_WRITE |
- HA_INPLACE_DROP_INDEX_NO_READ_WRITE |
- HA_INPLACE_ADD_UNIQUE_INDEX_NO_READ_WRITE |
- HA_INPLACE_DROP_UNIQUE_INDEX_NO_READ_WRITE |
- HA_INPLACE_ADD_PK_INDEX_NO_READ_WRITE |
- HA_INPLACE_DROP_PK_INDEX_NO_READ_WRITE |
- HA_INPLACE_ADD_INDEX_NO_WRITE |
- HA_INPLACE_DROP_INDEX_NO_WRITE |
- HA_INPLACE_ADD_UNIQUE_INDEX_NO_WRITE |
- HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE |
- HA_INPLACE_ADD_PK_INDEX_NO_WRITE |
- HA_INPLACE_DROP_PK_INDEX_NO_WRITE |
- HA_PARTITION_FUNCTION_SUPPORTED |
- 0;
-
- if (flags & ALTER_DROP_PARTITION)
- return 0;
-
- return f;
-}
-#endif
#define NDB_AUTO_INCREMENT_RETRIES 100
#define BATCH_FLUSH_SIZE (32768)
@@ -11856,8 +11829,7 @@ static int ndbcluster_init(void *p)
h->show_status= ndbcluster_show_status; /* Show status */
h->alter_tablespace= ndbcluster_alter_tablespace; /* Show status */
h->partition_flags= ndbcluster_partition_flags; /* Partition flags */
- h->alter_table_flags=
- ndbcluster_alter_table_flags; /* Alter table flags */
+ h->alter_table_flags=ndbcluster_alter_table_flags; /* Alter table flags */
#if MYSQL_VERSION_ID >= 50501
h->fill_is_table= ndbcluster_fill_is_table;
#else
@@ -12420,9 +12392,7 @@ ulonglong ha_ndbcluster::table_flags(voi
HA_HAS_OWN_BINLOGGING |
HA_BINLOG_ROW_CAPABLE |
HA_HAS_RECORDS |
-#ifndef NDB_WITHOUT_ONLINE_ALTER
HA_ONLINE_ALTER |
-#endif
HA_READ_BEFORE_WRITE_REMOVAL |
0;
@@ -15456,7 +15426,6 @@ ha_ndbcluster::set_up_partition_info(par
DBUG_RETURN(0);
}
-#ifndef NDB_WITHOUT_ONLINE_ALTER
static
HA_ALTER_FLAGS supported_alter_operations()
{
@@ -16273,8 +16242,9 @@ int ha_ndbcluster::alter_table_abort(THD
free_share(&m_share); // Decrease ref_count
DBUG_RETURN(error);
}
-#endif
+
+static
bool set_up_tablespace(st_alter_tablespace *alter_info,
NdbDictionary::Tablespace *ndb_ts)
{
@@ -16289,6 +16259,7 @@ bool set_up_tablespace(st_alter_tablespa
return FALSE;
}
+static
bool set_up_datafile(st_alter_tablespace *alter_info,
NdbDictionary::Datafile *ndb_df)
{
@@ -16303,6 +16274,7 @@ bool set_up_datafile(st_alter_tablespace
return FALSE;
}
+static
bool set_up_logfile_group(st_alter_tablespace *alter_info,
NdbDictionary::LogfileGroup *ndb_lg)
{
@@ -16317,6 +16289,7 @@ bool set_up_logfile_group(st_alter_table
return FALSE;
}
+static
bool set_up_undofile(st_alter_tablespace *alter_info,
NdbDictionary::Undofile *ndb_uf)
{
@@ -16326,6 +16299,7 @@ bool set_up_undofile(st_alter_tablespace
return FALSE;
}
+static
int ndbcluster_alter_tablespace(handlerton *hton,
THD* thd, st_alter_tablespace *alter_info)
{
=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h 2012-11-01 15:38:48 +0000
+++ b/sql/ha_ndbcluster.h 2012-11-27 12:53:59 +0000
@@ -350,7 +350,6 @@ static void set_tabname(const char *path
qc_engine_callback *engine_callback,
ulonglong *engine_data);
-#ifndef NDB_WITHOUT_ONLINE_ALTER
int check_if_supported_alter(TABLE *altered_table,
HA_CREATE_INFO *create_info,
HA_ALTER_INFO *alter_info,
@@ -377,7 +376,6 @@ static void set_tabname(const char *path
int alter_table_abort(THD *thd,
HA_ALTER_INFO *alter_info,
HA_ALTER_FLAGS *alter_flags);
-#endif
private:
#ifdef HAVE_NDB_BINLOG
@@ -467,9 +465,7 @@ private:
int ndb_optimize_table(THD* thd, uint delay);
-#ifndef NDB_WITHOUT_ONLINE_ALTER
int alter_frm(THD *thd, const char *file, NDB_ALTER_DATA *alter_data);
-#endif
bool check_all_operations_for_error(NdbTransaction *trans,
const NdbOperation *first,
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc 2012-11-26 14:49:24 +0000
+++ b/sql/ha_ndbcluster_binlog.cc 2012-11-28 12:50:14 +0000
@@ -335,12 +335,7 @@ ndb_binlog_open_shadow_table(THD *thd, N
(error= open_table_from_share(thd, shadow_table_share, "", 0,
(uint) (OPEN_FRM_FILE_ONLY | DELAYED_OPEN | READ_ALL),
0, shadow_table,
-#ifdef NDB_WITHOUT_ONLINE_ALTER
- false
-#else
- OTM_OPEN
-#endif
- )))
+ OTM_OPEN)))
{
DBUG_PRINT("error", ("failed to open shadow table, error: %d my_errno: %d",
error, my_errno));
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt 2012-11-28 08:58:55 +0000
+++ b/storage/ndb/CMakeLists.txt 2012-11-28 12:50:14 +0000
@@ -106,10 +106,7 @@ SET(NDBCLUSTER_SOURCES
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include)
IF(NOT MYSQL_CLUSTER_VERSION)
- # Online alter table not supported in non MySQL Cluster
- # versions yet, compile ndbcluster without online alter support
- ADD_DEFINITIONS(-DNDB_WITHOUT_ONLINE_ALTER)
- # The function 'make_db_list' i not available in non
+ # The function 'make_db_list' is not available in non
# MySQL Cluster version yet, compile ndbcluster without it
ADD_DEFINITIONS(-DNDB_WITHOUT_MAKE_DB_LIST)
ENDIF()
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4125 to 4127) | magnus.blaudd | 28 Nov |
