mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 20:11:42 +01:00
merge
This commit is contained in:
commit
e3edfcb4b0
3 changed files with 16 additions and 11 deletions
|
@ -98,6 +98,10 @@ IF(CYBOZU)
|
||||||
ADD_DEFINITIONS(-DCYBOZU)
|
ADD_DEFINITIONS(-DCYBOZU)
|
||||||
ENDIF(CYBOZU)
|
ENDIF(CYBOZU)
|
||||||
|
|
||||||
|
IF(EXTRA_DEBUG)
|
||||||
|
ADD_DEFINITIONS(-D EXTRA_DEBUG)
|
||||||
|
ENDIF(EXTRA_DEBUG)
|
||||||
|
|
||||||
# in some places we use DBUG_OFF
|
# in some places we use DBUG_OFF
|
||||||
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF")
|
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF")
|
||||||
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
|
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
|
||||||
|
|
|
@ -5304,8 +5304,8 @@ static bool write_log_changed_partitions(ALTER_PARTITION_PARAM_TYPE *lpt,
|
||||||
DDL_LOG_ENTRY ddl_log_entry;
|
DDL_LOG_ENTRY ddl_log_entry;
|
||||||
partition_info *part_info= lpt->part_info;
|
partition_info *part_info= lpt->part_info;
|
||||||
DDL_LOG_MEMORY_ENTRY *log_entry;
|
DDL_LOG_MEMORY_ENTRY *log_entry;
|
||||||
char tmp_path[FN_LEN];
|
char tmp_path[FN_REFLEN];
|
||||||
char normal_path[FN_LEN];
|
char normal_path[FN_REFLEN];
|
||||||
List_iterator<partition_element> part_it(part_info->partitions);
|
List_iterator<partition_element> part_it(part_info->partitions);
|
||||||
uint temp_partitions= part_info->temp_partitions.elements;
|
uint temp_partitions= part_info->temp_partitions.elements;
|
||||||
uint no_elements= part_info->partitions.elements;
|
uint no_elements= part_info->partitions.elements;
|
||||||
|
@ -5516,7 +5516,7 @@ static bool write_log_drop_shadow_frm(ALTER_PARTITION_PARAM_TYPE *lpt)
|
||||||
partition_info *part_info= lpt->part_info;
|
partition_info *part_info= lpt->part_info;
|
||||||
DDL_LOG_MEMORY_ENTRY *log_entry;
|
DDL_LOG_MEMORY_ENTRY *log_entry;
|
||||||
DDL_LOG_MEMORY_ENTRY *exec_log_entry= NULL;
|
DDL_LOG_MEMORY_ENTRY *exec_log_entry= NULL;
|
||||||
char shadow_path[FN_LEN];
|
char shadow_path[FN_REFLEN];
|
||||||
DBUG_ENTER("write_log_drop_shadow_frm");
|
DBUG_ENTER("write_log_drop_shadow_frm");
|
||||||
|
|
||||||
build_table_shadow_filename(shadow_path, sizeof(shadow_path), lpt);
|
build_table_shadow_filename(shadow_path, sizeof(shadow_path), lpt);
|
||||||
|
@ -5559,8 +5559,8 @@ static bool write_log_rename_frm(ALTER_PARTITION_PARAM_TYPE *lpt)
|
||||||
partition_info *part_info= lpt->part_info;
|
partition_info *part_info= lpt->part_info;
|
||||||
DDL_LOG_MEMORY_ENTRY *log_entry;
|
DDL_LOG_MEMORY_ENTRY *log_entry;
|
||||||
DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry;
|
DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry;
|
||||||
char path[FN_LEN];
|
char path[FN_REFLEN];
|
||||||
char shadow_path[FN_LEN];
|
char shadow_path[FN_REFLEN];
|
||||||
DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry;
|
DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry;
|
||||||
DBUG_ENTER("write_log_rename_frm");
|
DBUG_ENTER("write_log_rename_frm");
|
||||||
|
|
||||||
|
@ -5610,8 +5610,8 @@ static bool write_log_drop_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
|
||||||
partition_info *part_info= lpt->part_info;
|
partition_info *part_info= lpt->part_info;
|
||||||
DDL_LOG_MEMORY_ENTRY *log_entry;
|
DDL_LOG_MEMORY_ENTRY *log_entry;
|
||||||
DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry;
|
DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry;
|
||||||
char tmp_path[FN_LEN];
|
char tmp_path[FN_REFLEN];
|
||||||
char path[FN_LEN];
|
char path[FN_REFLEN];
|
||||||
uint next_entry= 0;
|
uint next_entry= 0;
|
||||||
DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry;
|
DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry;
|
||||||
DBUG_ENTER("write_log_drop_partition");
|
DBUG_ENTER("write_log_drop_partition");
|
||||||
|
@ -5669,8 +5669,8 @@ static bool write_log_add_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
|
||||||
partition_info *part_info= lpt->part_info;
|
partition_info *part_info= lpt->part_info;
|
||||||
DDL_LOG_MEMORY_ENTRY *log_entry;
|
DDL_LOG_MEMORY_ENTRY *log_entry;
|
||||||
DDL_LOG_MEMORY_ENTRY *exec_log_entry= NULL;
|
DDL_LOG_MEMORY_ENTRY *exec_log_entry= NULL;
|
||||||
char tmp_path[FN_LEN];
|
char tmp_path[FN_REFLEN];
|
||||||
char path[FN_LEN];
|
char path[FN_REFLEN];
|
||||||
uint next_entry= 0;
|
uint next_entry= 0;
|
||||||
DBUG_ENTER("write_log_add_change_partition");
|
DBUG_ENTER("write_log_add_change_partition");
|
||||||
|
|
||||||
|
@ -5723,8 +5723,8 @@ static bool write_log_final_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
|
||||||
partition_info *part_info= lpt->part_info;
|
partition_info *part_info= lpt->part_info;
|
||||||
DDL_LOG_MEMORY_ENTRY *log_entry;
|
DDL_LOG_MEMORY_ENTRY *log_entry;
|
||||||
DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry;
|
DDL_LOG_MEMORY_ENTRY *exec_log_entry= part_info->exec_log_entry;
|
||||||
char path[FN_LEN];
|
char path[FN_REFLEN];
|
||||||
char shadow_path[FN_LEN];
|
char shadow_path[FN_REFLEN];
|
||||||
DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry;
|
DDL_LOG_MEMORY_ENTRY *old_first_log_entry= part_info->first_log_entry;
|
||||||
uint next_entry= 0;
|
uint next_entry= 0;
|
||||||
DBUG_ENTER("write_log_final_change_partition");
|
DBUG_ENTER("write_log_final_change_partition");
|
||||||
|
|
|
@ -48,6 +48,7 @@ try
|
||||||
case "__NT__":
|
case "__NT__":
|
||||||
case "CYBOZU":
|
case "CYBOZU":
|
||||||
case "EMBED_MANIFESTS":
|
case "EMBED_MANIFESTS":
|
||||||
|
case "EXTRA_DEBUG":
|
||||||
case "WITH_EMBEDDED_SERVER":
|
case "WITH_EMBEDDED_SERVER":
|
||||||
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
|
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue