diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-27 19:31:49 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-27 19:31:49 +0200 |
| commit | 9d77ad534c05ae9073cfcad183265c57163c2536 (patch) | |
| tree | d28a6d1f930596f828c5f26824d51b1c917abe91 /sql/sql_table.cc | |
| parent | 51f7d585fede721fe0038d47736c780fb631c8f7 (diff) | |
| download | mariadb-git-9d77ad534c05ae9073cfcad183265c57163c2536.tar.gz | |
Remove compiler warnings
mysql-test/mysql-test-run.pl:
Fix warning when using --extern
sql/field.cc:
Fix wrong fix
sql/ha_ndbcluster.cc:
Better fixes to remove compiler warnings
sql/ha_ndbcluster_binlog.cc:
Better fixes to remove compiler warnings
sql/log.cc:
Fix compiler warnings
sql/sql_parse.cc:
Indentation fix
sql/sql_table.cc:
Indentation fixes
storage/myisammrg/ha_myisammrg.cc:
Fix compiler warnings
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fix compiler warnings
support-files/compiler_warnings.supp:
Suppress all 'safe' warnings, as detected by win64
win/README:
Fixed typo
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index da953060d04..0697fdd79b4 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -41,7 +41,7 @@ static int copy_data_between_tables(TABLE *from,TABLE *to, static bool prepare_blob_field(THD *thd, create_field *sql_field); static bool check_engine(THD *thd, const char *table_name, - HA_CREATE_INFO *create_info); + HA_CREATE_INFO *create_info); static int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info, List<create_field> *fields, List<Key> *keys, bool tmp_table, @@ -4818,7 +4818,8 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, else unlock_dst_table= TRUE; - IF_DBUG(int result=)store_create_info(thd, table, &query, create_info); + IF_DBUG(int result=) store_create_info(thd, table, &query, + create_info); DBUG_ASSERT(result == 0); // store_create_info() always return 0 write_bin_log(thd, TRUE, query.ptr(), query.length()); @@ -6645,7 +6646,8 @@ view_err: thd->query, thd->query_length, db, table_name); - DBUG_ASSERT(!(mysql_bin_log.is_open() && thd->current_stmt_binlog_row_based && + DBUG_ASSERT(!(mysql_bin_log.is_open() && + thd->current_stmt_binlog_row_based && (create_info->options & HA_LEX_CREATE_TMP_TABLE))); write_bin_log(thd, TRUE, thd->query, thd->query_length); |