mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 00:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix Bug#17600: Invalid data logged into mysql.slow_log

Browse source 
Recommit with post-review fixes.


mysql-test/r/log_tables.result:
  update result
mysql-test/t/log_tables.test:
  add a test
sql/log.cc:
  Fix NULL handling in log tables
storage/csv/ha_tina.cc:
   Explicitly check fo NULLs, when writing a row.
   We should not hope, that the null field was
   cleaned up.
   Though usually we do call Field::reset() or
   restore_row(), before calling Field::set_null(),
   this depency is neither documented nor enforced
   by other means.
mysql-test/t/log_tables-master.opt:
  New BitKeeper file ``mysql-test/t/log_tables-master.opt''
This commit is contained in:
unknown 2006-03-06 21:03:17 +03:00
commit 5fd44f2cc6
5 changed files with 69 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
storage/csv/ha_tina.cc
View file

@ -351,9 +351,20 @@ int ha_tina::encode_quote(byte *buf)
const char *ptr;
const char *end_ptr;
(*field)->val_str(&attribute,&attribute);
ptr= attribute.ptr();
end_ptr= attribute.length() + ptr;
/*
Write an empty string to the buffer in case of a NULL value.
Basically this is a safety check, as no one ensures that the
field content is cleaned up every time we use Field::set_null()
in the code.
*/
if ((*field)->is_null())
ptr= end_ptr= 0;
else
{
(*field)->val_str(&attribute,&attribute);
ptr= attribute.ptr();
end_ptr= attribute.length() + ptr;
}
buffer.append('"');