diff options
| -rw-r--r-- | mysql-test/r/type_blob.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_relayrotate.test | 2 | ||||
| -rw-r--r-- | sql/field.h | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/r/type_blob.result b/mysql-test/r/type_blob.result index a537aeeca07..d39f72cbe0b 100644 --- a/mysql-test/r/type_blob.result +++ b/mysql-test/r/type_blob.result @@ -29,7 +29,7 @@ drop table t1,t2,t3 CREATE TABLE t1 (a char(257) default "hello"); ERROR 42000: Too big column length for column 'a' (max = 255). Use BLOB instead CREATE TABLE t2 (a blob default "hello"); -ERROR 42000: BLOB column 'a' can't have a default value +ERROR 42000: BLOB/TEXT column 'a' can't have a default value drop table if exists t1,t2; create table t1 (nr int(5) not null auto_increment,b blob,str char(10), primary key (nr)); insert into t1 values (null,"a","A"); diff --git a/mysql-test/t/rpl_relayrotate.test b/mysql-test/t/rpl_relayrotate.test index 09cf7cbb741..3df55eea57d 100644 --- a/mysql-test/t/rpl_relayrotate.test +++ b/mysql-test/t/rpl_relayrotate.test @@ -14,7 +14,9 @@ source include/master-slave.inc; connection slave; stop slave; connection master; +--disable_warnings create table t1 (a int) type=innodb; +--enable_warnings let $1=8000; disable_query_log; begin; diff --git a/sql/field.h b/sql/field.h index 4456eb36731..a1f19638658 100644 --- a/sql/field.h +++ b/sql/field.h @@ -37,7 +37,11 @@ class Field void operator=(Field &); public: static void *operator new(size_t size) {return (void*) sql_alloc((uint) size); } - static void operator delete(void *ptr_arg, size_t size) {} /*lint -e715 */ + static void operator delete(void *ptr_arg, size_t size) { +#ifdef PEDANTIC_SAFEMALLOC + bfill(ptr_arg, size, 0x8F); +#endif + } char *ptr; // Position to field in record uchar *null_ptr; // Byte where null_bit is |