summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2005-03-18 19:09:22 +0200
committerunknown <heikki@hundin.mysql.fi>2005-03-18 19:09:22 +0200
commit809291fb929ae826cb65920cc939eb0e6e803cfd (patch)
tree5e647842ceaedd43b2be4990a91be5abfdc8fecc /innobase
parent208eed01afffa2d3965d4dd1c04e39318d16da5e (diff)
downloadmariadb-git-809291fb929ae826cb65920cc939eb0e6e803cfd.tar.gz
data0type.ic:
Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT innobase/include/data0type.ic: Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/data0type.ic6
1 files changed, 4 insertions, 2 deletions
diff --git a/innobase/include/data0type.ic b/innobase/include/data0type.ic
index bf04e1c9b27..a87a08ca582 100644
--- a/innobase/include/data0type.ic
+++ b/innobase/include/data0type.ic
@@ -195,10 +195,12 @@ dtype_get_pad_char(
|| type->mtype == DATA_BINARY
|| type->mtype == DATA_FIXBINARY
|| type->mtype == DATA_MYSQL
- || type->mtype == DATA_VARMYSQL) {
+ || type->mtype == DATA_VARMYSQL
+ || (type->mtype == DATA_BLOB
+ && (type->prtype & DATA_BINARY_TYPE) == 0)) {
/* Space is the padding character for all char and binary
- strings */
+ strings, and starting from 5.0.3, also for TEXT strings. */
return((ulint)' ');
}