unknown e771ee75e7 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.

2008-05-14 09:50:16 +03:00

..

r

Manual merge and some fixes.

2008-05-14 09:50:16 +03:00

std_data

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1

2008-02-07 12:38:13 +01:00

t

Manual merge and some fixes.

2008-05-14 09:50:16 +03:00

combinations

Eliminating compiler warnings.

2008-03-25 15:20:42 +01:00