into  mysql.com:/home/my/mysql-maria


include/my_base.h:
  Auto merged
mysql-test/r/maria.result:
  Auto merged
sql/handler.h:
  Auto merged
storage/maria/ha_maria.cc:
  Auto merged