database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge and some fixes.

Browse Source 
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.
This commit is contained in:
unknown
2008-05-14 09:50:16 +03:00
parent 663f971b8d
commit e771ee75e7
8 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/include/varchar.inc
View File

@ -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);