Manually import InnoDB fix into build tree.

31ecea8a · jimw@mysql.com · 146994ed · 31ecea8a
Commit 31ecea8a authored Mar 18, 2005 by jimw@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

innobase/include/data0type.ic innobase/include/data0type.ic +4 -2

No files found.
--- 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)' ');
 	}