1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#12406055 post-push fix: unused variable 'num_chars' in optimized build.

Browse Source 
Also fixed possibly uninitialized use of need_copy_table_res.
This commit is contained in:
Tor Didriksen 2011-11-01 07:50:54 +01:00
parent 59a38155bb
commit d5b8ce6a2d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/sql_string.cc
View File

@ -188,7 +188,8 @@ end:
#else #else
#ifdef HAVE_SNPRINTF #ifdef HAVE_SNPRINTF
buff[sizeof(buff)-1]=0; // Safety buff[sizeof(buff)-1]=0; // Safety
int num_chars= snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num); IF_DBUG(int num_chars= )
snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
DBUG_ASSERT(num_chars > 0); DBUG_ASSERT(num_chars > 0);
DBUG_ASSERT(num_chars < (int) sizeof(buff)); DBUG_ASSERT(num_chars < (int) sizeof(buff));
#else #else

2
sql/sql_table.cc
View File

@ -6985,7 +6985,7 @@ view_err:
need_copy_table= ALTER_TABLE_DATA_CHANGED; need_copy_table= ALTER_TABLE_DATA_CHANGED;
else else
{ {
enum_alter_table_change_level need_copy_table_res; enum_alter_table_change_level need_copy_table_res=ALTER_TABLE_METADATA_ONLY;
/* Check how much the tables differ. */ /* Check how much the tables differ. */
if (compare_tables(table, alter_info, if (compare_tables(table, alter_info,
create_info, order_num, create_info, order_num,