diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2009-12-17 10:52:43 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2009-12-17 10:52:43 +0400 |
| commit | 4621d480fc476127722e7a14656051edebb3673c (patch) | |
| tree | 24859cf9b1f0bec4fa17c53528f5c38de7efa95c | |
| parent | 4338e06f518aa1d5e4c621b80a5b265afb603f61 (diff) | |
| parent | 06be03f77cc1dbd3f52232d98fbab2d220d93fc5 (diff) | |
| download | mariadb-git-4621d480fc476127722e7a14656051edebb3673c.tar.gz | |
Auto-merge.
| -rw-r--r-- | mysql-test/r/myisam.result | 15 | ||||
| -rw-r--r-- | mysql-test/t/myisam.test | 14 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 11 |
3 files changed, 39 insertions, 1 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 95fdc4fb93d..c68bc91aa41 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -1853,6 +1853,21 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK DROP TABLE t1; +# +# Bug #49465: valgrind warnings and incorrect live checksum... +# +CREATE TABLE t1( +a VARCHAR(1), b VARCHAR(1), c VARCHAR(1), +f VARCHAR(1), g VARCHAR(1), h VARCHAR(1), +i VARCHAR(1), j VARCHAR(1), k VARCHAR(1)) CHECKSUM=1; +INSERT INTO t1 VALUES('', '', '', '', '', '', '', '', ''); +CHECKSUM TABLE t1 QUICK; +Table Checksum +test.t1 467455460 +CHECKSUM TABLE t1 EXTENDED; +Table Checksum +test.t1 467455460 +DROP TABLE t1; End of 5.0 tests create table t1 (a int not null, key `a` (a) key_block_size=1024); show create table t1; diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 56fe103adc9..351027ab246 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -1184,6 +1184,20 @@ SELECT a FROM t1; CHECK TABLE t1; DROP TABLE t1; + +--echo # +--echo # Bug #49465: valgrind warnings and incorrect live checksum... +--echo # +CREATE TABLE t1( +a VARCHAR(1), b VARCHAR(1), c VARCHAR(1), +f VARCHAR(1), g VARCHAR(1), h VARCHAR(1), +i VARCHAR(1), j VARCHAR(1), k VARCHAR(1)) CHECKSUM=1; +INSERT INTO t1 VALUES('', '', '', '', '', '', '', '', ''); +CHECKSUM TABLE t1 QUICK; +CHECKSUM TABLE t1 EXTENDED; +DROP TABLE t1; + + --echo End of 5.0 tests diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e9a36629c66..9754d5575e8 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -782,12 +782,21 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, restore_record(table,s->default_values); // Get empty record else { + TABLE_SHARE *share= table->s; + /* Fix delete marker. No need to restore rest of record since it will be overwritten by fill_record() anyway (and fill_record() does not use default values in this case). */ - table->record[0][0]= table->s->default_values[0]; + table->record[0][0]= share->default_values[0]; + + /* Fix undefined null_bits. */ + if (share->null_bytes > 1 && share->last_null_bit_pos) + { + table->record[0][share->null_bytes - 1]= + share->default_values[share->null_bytes - 1]; + } } if (fill_record_n_invoke_before_triggers(thd, table->field, *values, 0, table->triggers, |