diff options
author | unknown <gshchepa/uchum@host.loc> | 2008-05-06 21:43:46 +0500 |
---|---|---|
committer | unknown <gshchepa/uchum@host.loc> | 2008-05-06 21:43:46 +0500 |
commit | 5a1b7ddb683a34c0a512c890a11170e0b0b14da2 (patch) | |
tree | 274f7ab47cd2d388e2f9a34437a09d2eaba46f74 /mysql-test/r/heap.result | |
parent | 65a310fe2a594aca6e73308896763933adb59e3e (diff) | |
download | mariadb-git-5a1b7ddb683a34c0a512c890a11170e0b0b14da2.tar.gz |
Partial rollback of fix for bug #30059: End-space truncation is inconsistent
or incorrect.
For better conformance with standard, truncation procedure of CHAR columns
has been changed to ignore truncation of trailing whitespace characters
(note has been removed).
Finally, for columns with non-binary charsets:
1. CHAR(N) columns silently ignore trailing whitespace truncation;
2. VARCHAR and TEXT columns issue Note about truncation.
BLOBs and other columns with BINARY charset are unaffected.
mysql-test/r/bdb.result:
Rollback of bug #30059 fix.
mysql-test/r/heap.result:
Rollback of bug #30059 fix.
mysql-test/r/innodb.result:
Rollback of bug #30059 fix.
mysql-test/r/myisam.result:
Rollback of bug #30059 fix.
mysql-test/r/strict.result:
Rollback of bug #30059 fix.
mysql-test/r/type_binary.result:
Rollback of bug #30059 fix.
mysql-test/r/warnings.result:
Updated test case for bug #30059.
sql/field.cc:
Post-commit fix for bug #30059.
The Field_longstr::report_if_important_data method
has been changed to notify about trailing spaces only if
the new count_spaces parameter is TRUE.
The Field_string::store method has been changed to
ignore trailing whitespace truncation (CHAR column
type).
sql/field.h:
Post-commit fix for bug #30059.
The Field_longstr::report_if_important_data method declaration
has been changed to accept extra parameter: bool count_spaces.
Diffstat (limited to 'mysql-test/r/heap.result')
-rw-r--r-- | mysql-test/r/heap.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result index adfcc00174f..906c431b834 100644 --- a/mysql-test/r/heap.result +++ b/mysql-test/r/heap.result @@ -256,7 +256,6 @@ set @a=repeat(' ',20); insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a)); Warnings: Note 1265 Data truncated for column 'v' at row 1 -Note 1265 Data truncated for column 'c' at row 1 select concat('*',v,'*',c,'*',t,'*') from t1; concat('*',v,'*',c,'*',t,'*') *+ *+*+ * |