Alexander Barkov 8a732d5a5e Merge from 5.2 ...

modified:
  mysql-test/suite/plugins/r/fulltext_plugin.result
  mysql-test/suite/plugins/t/fulltext_plugin.test
  plugin/fulltext/plugin_example.c
  sql/sql_show.cc
pending merges:
  Alexander Barkov 2013-07-09 [merge] Merge from 5.1
    Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninst...
    Sergei Golubchik 2013-05-24 MDEV-4575 MySQL client doesn't strip off...

2013-07-09 11:02:56 +04:00

..

auth

lp:901693 dialog.c:perform_dialog treats every password prompt as first

2012-01-12 20:13:41 +01:00

auth_pam

merge

2012-09-27 15:02:17 +02:00

daemon_example

Merge with MariaDB 5.1

2011-11-24 18:48:58 +02:00

feedback

5.2->5.3 merge

2013-01-10 15:40:21 +01:00

fulltext

Merge from 5.1

2013-07-09 10:54:47 +04:00

handler_socket

Compatibility fixes by U Orsini

2012-03-30 16:00:10 +03:00

Makefile.am

Initail merge with MySQL 5.1 (XtraDB still needs to be merged)

2011-11-21 19:13:14 +02:00