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.

1 files changed, 1 insertions, 0 deletions

diff --git a/sql/item.h b/sql/item.h
index f4d7da55496..57399e935cd 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1028,6 +1028,7 @@ public:
     if (orig_name)
       name= orig_name;
   }
+  Item_basic_constant() {}                      /* Remove gcc warning */
 };