3809 kevin.lewis@stripped 2012-05-10
Whitespace changes and a compiler warning on windows.
modified:
storage/innobase/dict/dict0boot.cc
storage/innobase/fil/fil0fil.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/handler0alter.cc
storage/innobase/handler/i_s.cc
storage/innobase/include/dict0boot.h
storage/innobase/include/dict0crea.h
storage/innobase/include/read0read.h
storage/innobase/sync/sync0sync.cc
3808 Vasil Dimov 2012-05-10
Non-functional change - remove unnecessary parameter from
dict_stats_init(), it is always being passed as FALSE.
modified:
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/dict0stats.h
storage/innobase/include/dict0stats.ic
=== modified file 'storage/innobase/dict/dict0boot.cc'
--- a/storage/innobase/dict/dict0boot.cc revid:vasil.dimov@stripped
+++ b/storage/innobase/dict/dict0boot.cc revid:kevin.lewis@stripped
@@ -476,7 +476,7 @@ dict_insert_initial_data(void)
}
/*****************************************************************//**
-Creates and initializes the data dictionary at the database creation. */
+Creates and initializes the data dictionary at the server bootstrap. */
UNIV_INTERN
void
dict_create(void)
=== modified file 'storage/innobase/fil/fil0fil.cc'
--- a/storage/innobase/fil/fil0fil.cc revid:vasil.dimov@stripped
+++ b/storage/innobase/fil/fil0fil.cc revid:kevin.lewis@stripped
@@ -1538,7 +1538,7 @@ fil_space_get_flags(
ut_ad(fil_system);
- if (UNIV_UNLIKELY(!id)) {
+ if (!id) {
return(0);
}
@@ -1898,7 +1898,7 @@ fil_read_first_page(
*flags = fsp_header_get_flags(page);
- flushed_lsn = mach_read_from_8(page+ FIL_PAGE_FILE_FLUSH_LSN);
+ flushed_lsn = mach_read_from_8(page + FIL_PAGE_FILE_FLUSH_LSN);
ut_free(buf);
@@ -2220,8 +2220,8 @@ fil_op_log_parse_or_replay(
if (fil_get_space_id_for_table(new_name)
== ULINT_UNDEFINED) {
- /* We do not care of the old name, that is
- why we pass NULL as the first argument */
+ /* We do not care about the old name, that
+ is why we pass NULL as the first argument. */
if (!fil_rename_tablespace(NULL, space_id,
new_name)) {
ut_error;
@@ -2663,6 +2663,8 @@ retry:
space->stop_ios = TRUE;
+ /* The following code must change when InnoDB supports
+ multiple datafiles per tablespace. */
ut_a(UT_LIST_GET_LEN(space->chain) == 1);
node = UT_LIST_GET_FIRST(space->chain);
@@ -3370,7 +3372,7 @@ fil_load_single_table_tablespace(
size = os_file_get_size(file);
- if (UNIV_UNLIKELY(size == (os_offset_t) -1)) {
+ if (size == (os_offset_t) -1) {
/* The following call prints an error message */
os_file_get_last_error(TRUE);
@@ -3538,10 +3540,10 @@ fil_load_single_table_tablespace(
if (srv_force_recovery > 0) {
fprintf(stderr,
- "InnoDB: innodb_force_recovery"
- " was set to %lu. Continuing crash recovery\n"
- "InnoDB: even though the tablespace creation"
- " of this table failed.\n",
+ "InnoDB: innodb_force_recovery was set"
+ " to %lu. Continuing crash recovery\n"
+ "InnoDB: even though the tablespace"
+ " creation of this table failed.\n",
srv_force_recovery);
goto func_exit;
}
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc revid:vasil.dimov@stripped
+++ b/storage/innobase/handler/ha_innodb.cc revid:kevin.lewis@stripped
@@ -2347,7 +2347,7 @@ innobase_invalidate_query_cache(
/* Argument TRUE below means we are using transactions */
#ifdef HAVE_QUERY_CACHE
- mysql_query_cache_invalidate4(trx->mysql_thd,
+ mysql_query_cache_invalidate4(static_cast<THD*>(trx->mysql_thd),
full_name,
(uint32) full_name_len,
TRUE);
@@ -2531,7 +2531,8 @@ trx_is_interrupted(
/*===============*/
trx_t* trx) /*!< in: transaction */
{
- return(trx && trx->mysql_thd && thd_killed(trx->mysql_thd));
+ return(trx && trx->mysql_thd
+ && thd_killed(static_cast<THD*>(trx->mysql_thd)));
}
/**********************************************************************//**
@@ -2544,7 +2545,7 @@ trx_is_strict(
trx_t* trx) /*!< in: transaction */
{
return(trx && trx->mysql_thd
- && THDVAR(trx->mysql_thd, strict_mode));
+ && THDVAR(static_cast<THD*>(trx->mysql_thd), strict_mode));
}
/**************************************************************//**
@@ -3838,8 +3839,8 @@ ha_innobase::primary_key_is_clustered()
/*****************************************************************//**
Normalizes a table name string. A normalized name consists of the
-database name catenated to '/' and table name. An example:
-test/mytable. On Windows normalization puts both the database name and the
+database name catenated to '/' and table name. Example: test/mytable.
+On Windows normalization puts both the database name and the
table name always to lower case if "set_lower_case" is set to TRUE. */
static
void
@@ -4492,13 +4493,13 @@ retry:
1) If boot against an installation from Windows
platform, then its partition table name could
- be all be in lower case in system tables. So we
- will need to check lower case name when load table.
+ be in lower case in system tables. So we will
+ need to check lower case name when load table.
- 2) If we boot an installation from other case
+ 2) If we boot an installation from other case
sensitive platform in Windows, we might need to
- check the existence of table name without lowering
- case them in the system table. */
+ check the existence of table name without lower
+ case in the system table. */
if (innobase_get_lower_case_table_names() == 1) {
if (!par_case_name_set) {
@@ -7254,7 +7255,7 @@ ha_innobase::index_read(
case DB_SUCCESS:
error = 0;
table->status = 0;
- srv_stats.n_rows_read.add(prebuilt->trx->id, 1);
+ srv_stats.n_rows_read.add((size_t) prebuilt->trx->id, 1);
break;
case DB_RECORD_NOT_FOUND:
error = HA_ERR_KEY_NOT_FOUND;
@@ -7486,7 +7487,7 @@ ha_innobase::general_fetch(
case DB_SUCCESS:
error = 0;
table->status = 0;
- srv_stats.n_rows_read.add(prebuilt->trx->id, 1);
+ srv_stats.n_rows_read.add((size_t) prebuilt->trx->id, 1);
break;
case DB_RECORD_NOT_FOUND:
error = HA_ERR_END_OF_FILE;
@@ -8068,7 +8069,7 @@ create_table_check_doc_id_col(
*doc_id_col = i;
} else {
push_warning_printf(
- trx->mysql_thd,
+ static_cast<THD*>(trx->mysql_thd),
Sql_condition::WARN_LEVEL_WARN,
ER_ILLEGAL_HA_CREATE_OPTION,
"InnoDB: FTS_DOC_ID column must be "
@@ -8107,9 +8108,10 @@ create_table_def(
ulint flags, /*!< in: table flags */
ulint flags2) /*!< in: table flags2 */
{
+ THD* thd = static_cast<THD*>(trx->mysql_thd);
dict_table_t* table;
ulint n_cols;
- dberr_t error;
+ dberr_t err;
ulint col_type;
ulint col_len;
ulint nulls_allowed;
@@ -8125,13 +8127,13 @@ create_table_def(
DBUG_ENTER("create_table_def");
DBUG_PRINT("enter", ("table_name: %s", table_name));
- DBUG_ASSERT(trx->mysql_thd != NULL);
+ DBUG_ASSERT(thd != NULL);
/* MySQL does the name length check. But we do additional check
on the name length here */
if (strlen(table_name) > MAX_FULL_NAME_LEN) {
push_warning_printf(
- trx->mysql_thd, Sql_condition::WARN_LEVEL_WARN,
+ thd, Sql_condition::WARN_LEVEL_WARN,
ER_TABLE_NAME,
"InnoDB: Table Name or Database Name is too long");
@@ -8143,7 +8145,7 @@ create_table_def(
if (strcmp(strchr(table_name, '/') + 1,
"innodb_table_monitor") == 0) {
push_warning(
- trx->mysql_thd, Sql_condition::WARN_LEVEL_WARN,
+ thd, Sql_condition::WARN_LEVEL_WARN,
HA_ERR_WRONG_COMMAND,
DEPRECATED_MSG_INNODB_TABLE_MONITOR);
}
@@ -8157,7 +8159,7 @@ create_table_def(
if (doc_id_col == ULINT_UNDEFINED) {
trx_commit_for_mysql(trx);
- error = DB_ERROR;
+ err = DB_ERROR;
goto error_ret;
} else {
has_doc_id_col = TRUE;
@@ -8200,8 +8202,7 @@ create_table_def(
if (!col_type) {
push_warning_printf(
- trx->mysql_thd,
- Sql_condition::WARN_LEVEL_WARN,
+ thd, Sql_condition::WARN_LEVEL_WARN,
ER_CANT_CREATE_TABLE,
"Error creating table '%s' with "
"column '%s'. Please check its "
@@ -8225,8 +8226,7 @@ create_table_def(
/* in data0type.h we assume that the
number fits in one byte in prtype */
push_warning_printf(
- trx->mysql_thd,
- Sql_condition::WARN_LEVEL_WARN,
+ thd, Sql_condition::WARN_LEVEL_WARN,
ER_CANT_CREATE_TABLE,
"In InnoDB, charset-collation codes"
" must be below 256."
@@ -8267,7 +8267,7 @@ err_col:
mem_heap_free(heap);
trx_commit_for_mysql(trx);
- error = DB_ERROR;
+ err = DB_ERROR;
goto error_ret;
}
@@ -8287,18 +8287,19 @@ err_col:
fts_add_doc_id_column(table, heap);
}
- error = row_create_table_for_mysql(table, trx);
+ err = row_create_table_for_mysql(table, trx);
mem_heap_free(heap);
- if (error == DB_DUPLICATE_KEY) {
- char buf[100];
+ if (err == DB_DUPLICATE_KEY) {
+ char display_name[FN_REFLEN];
char* buf_end = innobase_convert_identifier(
- buf, sizeof buf - 1, table_name, strlen(table_name),
- trx->mysql_thd, TRUE);
+ display_name, sizeof(display_name) - 1,
+ table_name, strlen(table_name),
+ thd, TRUE);
*buf_end = '\0';
- my_error(ER_TABLE_EXISTS_ERROR, MYF(0), buf);
+ my_error(ER_TABLE_EXISTS_ERROR, MYF(0), display_name);
}
if (flags2 & DICT_TF2_FTS) {
@@ -8306,7 +8307,7 @@ err_col:
}
error_ret:
- DBUG_RETURN(convert_error_code_to_mysql(error, flags, trx->mysql_thd));
+ DBUG_RETURN(convert_error_code_to_mysql(err, flags, thd));
}
/*****************************************************************//**
@@ -10342,8 +10343,8 @@ ha_innobase::info(
"space for table %s but its "
"tablespace has been discarded or "
"the .ibd file is missing. Setting "
- "the free space to zero. "
- "(errno: %d - %s)",
+ "the free space to zero. "
+ "(errno: %d - %s)",
ib_table->name, errno,
my_strerror(errbuf, sizeof(errbuf),
errno));
=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc revid:vasil.dimov@stripped
+++ b/storage/innobase/handler/handler0alter.cc revid:kevin.lewis@stripped
@@ -906,7 +906,7 @@ innobase_fts_check_doc_id_index_in_def(
}
return(FTS_EXIST_DOC_ID_INDEX);
- }
+ }
return(FTS_NOT_EXIST_DOC_ID_INDEX);
}
=== modified file 'storage/innobase/handler/i_s.cc'
--- a/storage/innobase/handler/i_s.cc revid:vasil.dimov@stripped
+++ b/storage/innobase/handler/i_s.cc revid:kevin.lewis@stripped
@@ -5512,10 +5512,11 @@ i_s_common_deinit(
DBUG_RETURN(0);
}
+/** SYS_TABLES ***************************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLES */
static ST_FIELD_INFO innodb_sys_tables_fields_info[] =
{
-#define SYS_TABLE_ID 0
+#define SYS_TABLES_ID 0
{STRUCT_FLD(field_name, "TABLE_ID"),
STRUCT_FLD(field_length, MY_INT64_NUM_DECIMAL_DIGITS),
STRUCT_FLD(field_type, MYSQL_TYPE_LONGLONG),
@@ -5524,7 +5525,7 @@ static ST_FIELD_INFO innodb_sys_tables_f
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
-#define SYS_TABLE_NAME 1
+#define SYS_TABLES_NAME 1
{STRUCT_FLD(field_name, "NAME"),
STRUCT_FLD(field_length, MAX_FULL_NAME_LEN + 1),
STRUCT_FLD(field_type, MYSQL_TYPE_STRING),
@@ -5533,7 +5534,7 @@ static ST_FIELD_INFO innodb_sys_tables_f
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
-#define SYS_TABLE_FLAG 2
+#define SYS_TABLES_FLAG 2
{STRUCT_FLD(field_name, "FLAG"),
STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS),
STRUCT_FLD(field_type, MYSQL_TYPE_LONG),
@@ -5542,7 +5543,7 @@ static ST_FIELD_INFO innodb_sys_tables_f
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
-#define SYS_TABLE_NUM_COLUMN 3
+#define SYS_TABLES_NUM_COLUMN 3
{STRUCT_FLD(field_name, "N_COLS"),
STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS),
STRUCT_FLD(field_type, MYSQL_TYPE_LONG),
@@ -5551,7 +5552,7 @@ static ST_FIELD_INFO innodb_sys_tables_f
STRUCT_FLD(old_name, ""),
STRUCT_FLD(open_method, SKIP_OPEN_TABLE)},
-#define SYS_TABLE_SPACE 4
+#define SYS_TABLES_SPACE 4
{STRUCT_FLD(field_name, "SPACE"),
STRUCT_FLD(field_length, MY_INT32_NUM_DECIMAL_DIGITS),
STRUCT_FLD(field_type, MYSQL_TYPE_LONG),
@@ -5581,15 +5582,15 @@ i_s_dict_fill_sys_tables(
fields = table_to_fill->field;
- OK(fields[SYS_TABLE_ID]->store(longlong(table->id), TRUE));
+ OK(fields[SYS_TABLES_ID]->store(longlong(table->id), TRUE));
- OK(field_store_string(fields[SYS_TABLE_NAME], table->name));
+ OK(field_store_string(fields[SYS_TABLES_NAME], table->name));
- OK(fields[SYS_TABLE_FLAG]->store(table->flags));
+ OK(fields[SYS_TABLES_FLAG]->store(table->flags));
- OK(fields[SYS_TABLE_NUM_COLUMN]->store(table->n_cols));
+ OK(fields[SYS_TABLES_NUM_COLUMN]->store(table->n_cols));
- OK(fields[SYS_TABLE_SPACE]->store(table->space));
+ OK(fields[SYS_TABLES_SPACE]->store(table->space));
OK(schema_table_store_record(thd, table_to_fill));
@@ -5742,6 +5743,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i
STRUCT_FLD(flags, 0UL),
};
+/** SYS_TABLESTATS ***********************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_TABLESTATS */
static ST_FIELD_INFO innodb_sys_tablestats_fields_info[] =
{
@@ -6034,6 +6036,7 @@ UNIV_INTERN struct st_mysql_plugin i_s_i
STRUCT_FLD(flags, 0UL),
};
+/** SYS_INDEXES **************************************************/
/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_INDEXES */
static ST_FIELD_INFO innodb_sysindex_fields_info[] =
{
@@ -6293,7 +6296,8 @@ UNIV_INTERN struct st_mysql_plugin i_s_i
STRUCT_FLD(flags, 0UL),
};
-/* Fields of the dynamic table INFORMATION_SCHEMA.SYS_COLUMNS */
+/** SYS_COLUMNS **************************************************/
+/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_COLUMNS */
static ST_FIELD_INFO innodb_sys_columns_fields_info[] =
{
#define SYS_COLUMN_TABLE_ID 0
@@ -6531,7 +6535,9 @@ UNIV_INTERN struct st_mysql_plugin i_s_i
/* unsigned long */
STRUCT_FLD(flags, 0UL),
};
-/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_fields */
+
+/** SYS_FIELDS ***************************************************/
+/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FIELDS */
static ST_FIELD_INFO innodb_sys_fields_fields_info[] =
{
#define SYS_FIELD_INDEX_ID 0
@@ -6743,7 +6749,8 @@ UNIV_INTERN struct st_mysql_plugin i_s_i
STRUCT_FLD(flags, 0UL),
};
-/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign */
+/** SYS_FOREIGN ********************************************/
+/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FOREIGN */
static ST_FIELD_INFO innodb_sys_foreign_fields_info[] =
{
#define SYS_FOREIGN_ID 0
@@ -6828,6 +6835,7 @@ i_s_dict_fill_sys_foreign(
DBUG_RETURN(0);
}
+
/*******************************************************************//**
Function to populate INFORMATION_SCHEMA.innodb_sys_foreign table. Loop
through each record in SYS_FOREIGN, and extract the foreign key
@@ -6894,6 +6902,7 @@ i_s_sys_foreign_fill_table(
DBUG_RETURN(0);
}
+
/*******************************************************************//**
Bind the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign
@return 0 on success */
@@ -6967,7 +6976,9 @@ UNIV_INTERN struct st_mysql_plugin i_s_i
/* unsigned long */
STRUCT_FLD(flags, 0UL),
};
-/* Fields of the dynamic table INFORMATION_SCHEMA.innodb_sys_foreign_cols */
+
+/** SYS_FOREIGN_COLS ********************************************/
+/* Fields of the dynamic table INFORMATION_SCHEMA.INNODB_SYS_FOREIGN_COLS */
static ST_FIELD_INFO innodb_sys_foreign_cols_fields_info[] =
{
#define SYS_FOREIGN_COL_ID 0
=== modified file 'storage/innobase/include/dict0boot.h'
--- a/storage/innobase/include/dict0boot.h revid:vasil.dimov@stripped
+++ b/storage/innobase/include/dict0boot.h revid:kevin.lewis@stripped
@@ -88,7 +88,7 @@ void
dict_boot(void);
/*===========*/
/*****************************************************************//**
-Creates and initializes the data dictionary at the database creation. */
+Creates and initializes the data dictionary at the server bootstrap. */
UNIV_INTERN
void
dict_create(void);
=== modified file 'storage/innobase/include/dict0crea.h'
--- a/storage/innobase/include/dict0crea.h revid:vasil.dimov@stripped
+++ b/storage/innobase/include/dict0crea.h revid:kevin.lewis@stripped
@@ -99,7 +99,7 @@ dict_drop_index_tree(
mtr_t* mtr); /*!< in: mtr having the latch on the record page */
/****************************************************************//**
Creates the foreign key constraints system tables inside InnoDB
-at database creation or database start if they are not found or are
+at server bootstrap or server start if they are not found or are
not of the right form.
@return DB_SUCCESS or error code */
UNIV_INTERN
@@ -131,7 +131,6 @@ dict_create_add_foreigns_to_dictionary(
__attribute__((nonnull, warn_unused_result));
/* Table create node structure */
-
struct tab_node_struct{
que_common_t common; /*!< node type: QUE_NODE_TABLE_CREATE */
dict_table_t* table; /*!< table to create, built as a memory data
=== modified file 'storage/innobase/include/read0read.h'
--- a/storage/innobase/include/read0read.h revid:vasil.dimov@stripped
+++ b/storage/innobase/include/read0read.h revid:kevin.lewis@stripped
@@ -148,7 +148,7 @@ struct read_view_struct{
trx_id_t* trx_ids;/*!< Additional trx ids which the read should
not see: typically, these are the read-write
active transactions at the time when the read
- is serialized, except the reading transaction
+ is serialized, except the reading transaction
itself; the trx ids in this array are in a
descending order. These trx_ids should be
between the "low" and "high" water marks,
=== modified file 'storage/innobase/sync/sync0sync.cc'
--- a/storage/innobase/sync/sync0sync.cc revid:vasil.dimov@stripped
+++ b/storage/innobase/sync/sync0sync.cc revid:kevin.lewis@stripped
@@ -1534,7 +1534,7 @@ sync_close(void)
mutex_free(mutex);
- mutex = UT_LIST_GET_FIRST(mutex_list);
+ mutex = UT_LIST_GET_FIRST(mutex_list);
}
mutex_free(&mutex_list_mutex);
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (kevin.lewis:3808 to 3809) | kevin.lewis | 22 May |
