Nirbhay Choubey ec91eea8db Local merge of mariadb-5.5.39 ...

bzr merge -r4264 maria/5.5

Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.

2014-08-06 14:06:11 -04:00

30 KiB

Raw Blame History

View Raw