database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixed errors and warnings found by buildbot

Browse Source 
mysql-test/r/lowercase_table2.result:
  Updated result
  (The change happend because we don't try to open the table anymore as part of create table)
mysql-test/suite/rpl/r/create_or_replace_mix.result:
  Fixed result file
mysql-test/suite/rpl/r/create_or_replace_row.result:
  Fixed result file
mysql-test/suite/rpl/r/create_or_replace_statement.result:
  Fixed result file
mysql-test/suite/rpl/t/create_or_replace.inc:
  Drop open temporary table
mysys/my_delete.c:
  Added missing newline
plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result:
  Fixed result
  (Lock names was before off by one. Was corrected by my previous patch)
sql/sql_select.cc:
  Fixed compiler warnings by adding missing casts
storage/connect/ha_connect.cc:
  Fixed compiler warnings
storage/innobase/os/os0file.cc:
  Fixed compiler warnings
storage/xtradb/btr/btr0btr.cc:
  Fixed compiler warnings
storage/xtradb/handler/ha_innodb.cc:
  removed not used function
strings/ctype-uca.c:
  Fixed compiler warnings
support-files/compiler_warnings.supp:
  Added suppression for warnings that are wrong or are not serious andthat we don't plan to fix.
This commit is contained in:
Michael Widenius
2014-02-06 16:14:09 +02:00
parent 1695fc4532
commit 313f18be5a
14 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/lowercase_table2.result
View File

@ -274,7 +274,7 @@ Database Table In_use Name_locked
test t_bug44738_uppercase 0 0 test t_bug44738_uppercase 0 0
# So attempt to create table with the same name should fail. # So attempt to create table with the same name should fail.
create table t_bug44738_UPPERCASE (i int); create table t_bug44738_UPPERCASE (i int);
ERROR HY000: Can't find file: './test/t_bug44738_uppercase.MYI' (errno: 2 "No such file or directory") ERROR 42S01: Table 't_bug44738_uppercase' already exists
# And should succeed after FLUSH TABLES. # And should succeed after FLUSH TABLES.
flush tables; flush tables;
create table t_bug44738_UPPERCASE (i int); create table t_bug44738_UPPERCASE (i int);

2
mysql-test/suite/rpl/r/create_or_replace_mix.result
View File

@ -158,5 +158,5 @@ slave-bin.000001 # Table_map # # table_id: # (test.t2)
slave-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F slave-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F
slave-bin.000001 # Xid # # COMMIT /* XID */ slave-bin.000001 # Xid # # COMMIT /* XID */
drop table t1; drop table t1;
drop table t2; drop table t2,t3;
include/rpl_end.inc include/rpl_end.inc

2
mysql-test/suite/rpl/r/create_or_replace_row.result
View File

@ -180,5 +180,5 @@ slave-bin.000001 # Table_map # # table_id: # (test.t2)
slave-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F slave-bin.000001 # Write_rows_v1 # # table_id: # flags: STMT_END_F
slave-bin.000001 # Xid # # COMMIT /* XID */ slave-bin.000001 # Xid # # COMMIT /* XID */
drop table t1; drop table t1;
drop table t2; drop table t2,t3;
include/rpl_end.inc include/rpl_end.inc

2
mysql-test/suite/rpl/r/create_or_replace_statement.result
View File

@ -140,5 +140,5 @@ slave-bin.000001 # Query # # use `test`; create table t2 engine=myisam select *
slave-bin.000001 # Gtid # # GTID #-#-# slave-bin.000001 # Gtid # # GTID #-#-#
slave-bin.000001 # Query # # use `test`; create or replace table t2 engine=innodb select * from t1 slave-bin.000001 # Query # # use `test`; create or replace table t2 engine=innodb select * from t1
drop table t1; drop table t1;
drop table t2; drop table t2,t3;
include/rpl_end.inc include/rpl_end.inc

2
mysql-test/suite/rpl/t/create_or_replace.inc
View File

@ -132,6 +132,6 @@ connection server_1;
drop table t1; drop table t1;
# Clean up # Clean up
drop table t2; drop table t2,t3;
--source include/rpl_end.inc --source include/rpl_end.inc

2
plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result
View File

@ -5,7 +5,7 @@ GET_LOCK('LOCK1',0)
1 1
SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info; SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info;
lock_mode lock_duration lock_type table_schema table_name lock_mode lock_duration lock_type table_schema table_name
MDL_SHARED_NO_READ_WRITE MDL_EXPLICIT User lock LOCK1 MDL_SHARED_NO_WRITE MDL_EXPLICIT User lock LOCK1
SELECT RELEASE_LOCK('LOCK1'); SELECT RELEASE_LOCK('LOCK1');
RELEASE_LOCK('LOCK1') RELEASE_LOCK('LOCK1')
1 1

7
sql/sql_select.cc
View File

@ -8252,7 +8252,8 @@ get_best_combination(JOIN *join)
sub-order sub-order
*/ */
SJ_MATERIALIZATION_INFO *sjm= cur_pos->table->emb_sj_nest->sj_mat_info; SJ_MATERIALIZATION_INFO *sjm= cur_pos->table->emb_sj_nest->sj_mat_info;
j->records= j->records_read= (ha_rows)(sjm->is_sj_scan? sjm->rows : 1); j->records_read= (sjm->is_sj_scan? sjm->rows : 1);
j->records= (ha_rows) j->records_read;
j->cond_selectivity= 1.0; j->cond_selectivity= 1.0;
JOIN_TAB *jt; JOIN_TAB *jt;
JOIN_TAB_RANGE *jt_range; JOIN_TAB_RANGE *jt_range;
@ -11152,7 +11153,7 @@ ha_rows JOIN_TAB::get_examined_rows()
else else
examined_rows= records_read; examined_rows= records_read;
return examined_rows; return (ha_rows) examined_rows;
} }
@ -23306,7 +23307,7 @@ int JOIN::save_explain_data_intern(Explain_query *output, bool need_tmp_table,
double examined_rows= tab->get_examined_rows(); double examined_rows= tab->get_examined_rows();
eta->rows_set= true; eta->rows_set= true;
eta->rows= examined_rows; eta->rows= (ha_rows) examined_rows;
/* "filtered" */ /* "filtered" */
float f= 0.0; float f= 0.0;

6
storage/connect/ha_connect.cc
View File

@ -2655,8 +2655,8 @@ int ha_connect::info(uint flag)
if (flag & HA_STATUS_CONST) { if (flag & HA_STATUS_CONST) {
// This is imported from the previous handler and must be reconsidered // This is imported from the previous handler and must be reconsidered
stats.max_data_file_length= 4294967295; stats.max_data_file_length= 4294967295LL;
stats.max_index_file_length= 4398046510080; stats.max_index_file_length= 4398046510080LL;
stats.create_time= 0; stats.create_time= 0;
data_file_name= xinfo.data_file_name; data_file_name= xinfo.data_file_name;
index_file_name= NULL; index_file_name= NULL;
@ -3895,7 +3895,7 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd,
TABLE_SHARE *table_s, TABLE_SHARE *table_s,
HA_CREATE_INFO *create_info) HA_CREATE_INFO *create_info)
{ {
char v, spc= ',', qch= 0; char v=0, spc= ',', qch= 0;
const char *fncn= "?"; const char *fncn= "?";
const char *user, *fn, *db, *host, *pwd, *sep, *tbl, *src; const char *user, *fn, *db, *host, *pwd, *sep, *tbl, *src;
const char *col, *ocl, *rnk, *pic, *fcl; const char *col, *ocl, *rnk, *pic, *fcl;

2
storage/innobase/os/os0file.cc
View File

@ -2096,7 +2096,7 @@ os_file_set_size(
fprintf(stderr, "InnoDB: Error: preallocating file " fprintf(stderr, "InnoDB: Error: preallocating file "
"space for file \'%s\' failed. Current size " "space for file \'%s\' failed. Current size "
"%lu, desired size %lu\n", "%lu, desired size %lu\n",
name, current_size, size); name, (long unsigned) current_size, (long unsigned) size);
os_file_handle_error_no_exit(name, "posix_fallocate", FALSE); os_file_handle_error_no_exit(name, "posix_fallocate", FALSE);
return(FALSE); return(FALSE);
} }

8
storage/xtradb/btr/btr0btr.cc
View File

@ -805,7 +805,7 @@ btr_height_get(
/* S latches the page */ /* S latches the page */
root_block = btr_root_block_get(index, RW_S_LATCH, mtr); root_block = btr_root_block_get(index, RW_S_LATCH, mtr);
height = btr_page_get_level(buf_block_get_frame(root_block), mtr); height = btr_page_get_level(buf_block_get_frame_fast(root_block), mtr);
/* Release the S latch on the root page. */ /* Release the S latch on the root page. */
mtr_memo_release(mtr, root_block, MTR_MEMO_PAGE_S_FIX); mtr_memo_release(mtr, root_block, MTR_MEMO_PAGE_S_FIX);
@ -2746,7 +2746,7 @@ btr_attach_half_pages(
} }
/* Get the level of the split pages */ /* Get the level of the split pages */
level = btr_page_get_level(buf_block_get_frame(block), mtr); level = btr_page_get_level(buf_block_get_frame_fast(block), mtr);
ut_ad(level ut_ad(level
== btr_page_get_level(buf_block_get_frame(new_block), mtr)); == btr_page_get_level(buf_block_get_frame(new_block), mtr));
@ -3970,8 +3970,8 @@ btr_discard_page(
/* Decide the page which will inherit the locks */ /* Decide the page which will inherit the locks */
left_page_no = btr_page_get_prev(buf_block_get_frame(block), mtr); left_page_no = btr_page_get_prev(buf_block_get_frame_fast(block), mtr);
right_page_no = btr_page_get_next(buf_block_get_frame(block), mtr); right_page_no = btr_page_get_next(buf_block_get_frame_fast(block), mtr);
if (left_page_no != FIL_NULL) { if (left_page_no != FIL_NULL) {
merge_block = btr_block_get(space, zip_size, left_page_no, merge_block = btr_block_get(space, zip_size, left_page_no,

2
storage/xtradb/handler/ha_innodb.cc
View File

@ -1230,6 +1230,7 @@ normalize_table_name_low(
ibool set_lower_case); /* in: TRUE if we want to set ibool set_lower_case); /* in: TRUE if we want to set
name to lower case */ name to lower case */
#ifdef NOT_USED
/*************************************************************//** /*************************************************************//**
Removes old archived transaction log files. Removes old archived transaction log files.
@return true on error */ @return true on error */
@ -1255,6 +1256,7 @@ static bool innobase_purge_archive_logs(
} }
return (err != DB_SUCCESS); return (err != DB_SUCCESS);
} }
#endif
/*************************************************************//** /*************************************************************//**
Check for a valid value of innobase_commit_concurrency. Check for a valid value of innobase_commit_concurrency.

2
strings/ctype-uca.c
View File

@ -22467,7 +22467,7 @@ wstr_to_str(char *str, size_t length, my_wc_t *wc, size_t wlength)
static void static void
my_charset_loader_error_for_rule(MY_CHARSET_LOADER *loader, my_charset_loader_error_for_rule(MY_CHARSET_LOADER *loader,
const MY_COLL_RULE *r, const MY_COLL_RULE *r __attribute__((unused)),
const char *name, const char *name,
my_wc_t *wc, size_t wlength) my_wc_t *wc, size_t wlength)
{ {

15
support-files/compiler_warnings.supp
View File

@ -51,6 +51,12 @@ fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits
log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type
#
# Xtradb engine
#
storage/xtradb/handler/ha_innodb\.cc: ignoring return value of
storage/xtradb/row/row0log\.cc: ignoring return value of
# #
# bdb is not critical to keep up to date # bdb is not critical to keep up to date
# #
@ -172,6 +178,15 @@ vio/viosslfactories\.c: discards ~const~ qualifier from pointer target type
# jemalloc # jemalloc
# #
jemalloc/src/jemalloc\.c: always_inline function might not be inlinable jemalloc/src/jemalloc\.c: always_inline function might not be inlinable
jemalloc/src/jemalloc\.c: set but not used
#
# Connect engine
#
storage/connect/connect\.cc: might be clobbered by ~longjmp~
storage/connect/filamvct\.cpp: ignoring return value of
storage/connect/filamvct\.cpp: might be clobbered by ~longjmp~
storage/connect/xindex\.cpp: ignoring return value of
# #
# Unexplanable (?) stuff # Unexplanable (?) stuff