diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-05-14 09:50:16 +0300 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-05-14 09:50:16 +0300 |
| commit | e771ee75e7d186119dbbcd88d1b0d6d9a94b775b (patch) | |
| tree | b868db1b5fc4534de308dd8a844c335507c38982 /mysql-test/include/varchar.inc | |
| parent | 663f971b8d6fd121825c41bf1fffcab72aaa885f (diff) | |
| download | mariadb-git-e771ee75e7d186119dbbcd88d1b0d6d9a94b775b.tar.gz | |
Manual merge and some fixes.
mysql-test/include/varchar.inc:
Manual merge between 5.1 and maria.
Added a comment.
mysql-test/r/maria.result:
Temporary fix.
mysql-test/suite/binlog/r/binlog_unsafe.result:
Manual merge.
mysql-test/suite/binlog/t/binlog_unsafe.test:
Manual merge.
sql/handler.h:
Manual merge + fix.
sql/item.h:
Manual merge + fix.
sql/log.cc:
Manual merge + fix.
sql/sql_insert.cc:
Manual merge + fix. A commit was done when using
create table ... select from for transactional tables
other than maria, when an error occurred and
transaction should have been aborted.
Diffstat (limited to 'mysql-test/include/varchar.inc')
| -rw-r--r-- | mysql-test/include/varchar.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/include/varchar.inc b/mysql-test/include/varchar.inc index 15306ed8385..7accbd151a9 100644 --- a/mysql-test/include/varchar.inc +++ b/mysql-test/include/varchar.inc @@ -11,6 +11,11 @@ enable_query_log; # Simple basic test that endspace is saved # +# +# Remember to check that one doesn't get a warning or a note +# from a char field when end spaces get removed. SQL standard! +# + create table t1 (v varchar(10), c char(10), t text); insert into t1 values('+ ', '+ ', '+ '); set @a=repeat(' ',20); |