[mariadb/el5] (11 commits) ...Merge branch 'f18' into el6

Thu Feb 14 09:22:21 UTC 2013

Summary of changes:

  b995ae2... Rebase to 5.5.29 Fix inaccurate default for socket location (*)
  ce7b16a... Let mariadb-libs to own /etc/my.cnf.d (*)
  3c249a7... Packages need to provide also %%_isa version of mysql packa (*)
  c2fb21e... Provide own symbols with real- prefix to distinguish from m (*)
  a85204b... Fix format for buffer size in error messages (MDEV-4156) (*)
  ec7c09c... Disable some tests that fail on ppc and s390 (*)
  87f5f75... Conflict only with real-mysql, otherwise mariadb conflicts  (*)
  50a9277... Typo in spec fixed (*)
  a152363... Disable main.myisampack test also for s390 (*)
  75039c4... Suppress warning in tests on ppc, Enable fixed index_merge_ (*)
  0e5f5fa... Merge branch 'f18' into el6 (*)

(*) This commit already existed in another branch; no separate mail sent