database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

PB2 was showing some valgrind warnings after WL#5151 was pushed.

Browse Source 
This patch fixes these warnings and some compile time warnings.

On top of that, it also fixes rpl_err_ignoredtable test failure.
This test was failing because the warning suppression text was not
matching the latest text. We fix this by making them match.


mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
  Replaced the suppression text.
sql/rpl_record.cc:
  - Fixed some compile time warnings (replaced %d --> %ld and 
    removed unused mas mask variable.
  - Fixed valgrind warnings when using c_ptr(). Replaced with 
    c_ptr_safe().
sql/rpl_utility.cc:
  - Fixed valgrind warnings when using c_ptr(). Replaced with 
    c_ptr_safe().
This commit is contained in:
Luis Soares
2009-12-22 11:51:46 +00:00
parent 56ff29a422
commit 67cc50d2a3
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/rpl_utility.cc
View File

@ -582,7 +582,7 @@ can_convert_field_to(Field *field,
String field_type(field_type_buf, sizeof(field_type_buf), field->charset());
field->sql_type(field_type);
DBUG_PRINT("enter", ("field_type: %s, target_type: %d, source_type: %d, source_metadata: 0x%x",
field_type.c_ptr(), field->real_type(), source_type, metadata));
field_type.c_ptr_safe(), field->real_type(), source_type, metadata));
#endif
/*
If the real type is the same, we need to check the metadata to
@ -836,7 +836,7 @@ table_def::compatible_with(THD *thd, Relay_log_info *rli,
DBUG_PRINT("debug", ("Field %s - conversion required."
" Source type: '%s', Target type: '%s'",
tmp_table->field[col]->field_name,
source_type.c_ptr(), target_type.c_ptr()));
source_type.c_ptr_safe(), target_type.c_ptr_safe()));
}
}
#endif