summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorTimothy Smith <timothy.smith@sun.com>2009-01-12 23:27:11 +0100
committerTimothy Smith <timothy.smith@sun.com>2009-01-12 23:27:11 +0100
commit897d00ce89e6eb2ef9c0f1688ccc6e4498527fd0 (patch)
tree70bf7386e9aa13858447770d9f1fd026cf4714d7 /storage
parent293e9c49c49cd0931125b637b95bb0fb99124e65 (diff)
downloadmariadb-git-897d00ce89e6eb2ef9c0f1688ccc6e4498527fd0.tar.gz
Applying InnoDB snapshot innodb-5.1-ss3603
Detailed description of changes: r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines branches/5.1: dtype_get_sql_null_size(): return the correct storage size of a SQL NULL column. (Bug #40369) When MySQL Bug #20877 was fixed in r834, this function was accidentally modified to return 0 or 1. Apparently, the only impact of this bug is that fixed-length columns cannot be updated in-place from or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix, fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant storage size as they should, no matter if NULL or non-NULL. The bug caused fixed-length NULL columns to occupy 1 byte. rb://37 approved by Heikki over IM.
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/include/data0type.ic2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic
index b8c24bb074a..ad0f95755d2 100644
--- a/storage/innobase/include/data0type.ic
+++ b/storage/innobase/include/data0type.ic
@@ -558,5 +558,5 @@ dtype_get_sql_null_size(
const dtype_t* type) /* in: type */
{
return(dtype_get_fixed_size_low(type->mtype, type->prtype, type->len,
- type->mbminlen, type->mbmaxlen) > 0);
+ type->mbminlen, type->mbmaxlen));
}