Seppo Jaakola bd0eae595f References: MDEV-4572 - merge with mariaDB 5.5.31 ... bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31 Text conflict in cmake/cpack_rpm.cmake Text conflict in debian/dist/Debian/control Text conflict in debian/dist/Ubuntu/control Text conflict in sql/CMakeLists.txt Conflict adding file sql/db.opt. Moved existing file to sql/db.opt.moved. Conflict adding file sql/db.opt.moved. Moved existing file to sql/db.opt.moved.moved. Text conflict in sql/mysqld.cc Text conflict in support-files/mysql.spec.sh 8 conflicts encountered.		2013-05-26 11:26:58 +03:00
..
os0file.c	References: MDEV-4572 - merge with mariaDB 5.5.31	2013-05-26 11:26:58 +03:00
os0proc.c	XtraDB from Percona-Server-5.5.28-rel29.1	2012-11-22 11:43:55 +01:00
os0sync.c	LPBUG#882689 - crash during startup on XP.	2011-08-08 18:01:33 +02:00
os0thread.c	MDEV-361 - Fix handle leak in os_thread_create (Windows)	2012-06-21 00:49:24 +02:00