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

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

Browse Source 
into  mysql.com:/usr/home/ram/work/bug22271/my50-bug22271


sql/field.cc:
  Auto merged
This commit is contained in:
unknown
2006-10-03 09:00:03 +05:00
parent b200331618 2b3633c7bd
commit f0cd4a8311
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/field.cc
View File

@ -7933,7 +7933,7 @@ int Field_bit::store(const char *from, uint length, CHARSET_INFO *cs)
(delta == -1 && (uchar) *from > ((1 << bit_len) - 1)) ||
(!bit_len && delta < 0))
{
set_rec_bits(0xff, bit_ptr, bit_ofs, bit_len);
set_rec_bits((1 << bit_len) - 1, bit_ptr, bit_ofs, bit_len);
memset(ptr, 0xff, bytes_in_rec);
if (table->in_use->really_abort_on_warning())
set_warning(MYSQL_ERROR::WARN_LEVEL_ERROR, ER_DATA_TOO_LONG, 1);