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

..

binlog

5.2->5.3 merge

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

engines

5.2 -> 5.3

2013-02-28 21:48:47 +01:00

federated

Merge MySQL 5.1.66 -> MariaDB 5.1.65

2012-11-06 11:52:55 +02:00

funcs_1

adjusted test result

2012-11-10 00:04:44 +02:00

funcs_2

Changed to Oracle bug numbers

2011-05-24 12:08:13 +05:30

handler

Fixed compiler warnings

2011-02-25 20:15:27 +02:00

ibmdb2i

…

im

…

innodb

5.2 -> 5.3

2013-02-28 21:48:47 +01:00

innodb_plugin

5.2 -> 5.3

2013-02-28 21:48:47 +01:00

jp

…

large_tests

…

manual

BUG#49978: Replication tests don't clean up replication state at the end

2010-12-19 18:07:28 +01:00

maria

MDEV-4651 Crash in my_decimal2decimal in a ORDER BY query

2013-06-17 17:04:51 +04:00

ndb

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

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

ndb_team

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

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

optimizer_unfixed_bugs

merge with 5.1-micro

2011-06-07 18:13:02 +02:00

oqgraph

…

parts

5.2 -> 5.3

2013-02-28 21:48:47 +01:00

pbxt

Update test results (checked)

2012-06-21 14:33:36 +04:00

percona

Added test case forlp:875797 Using 'innodb_sys_indexes' causes core dump

2011-11-24 19:07:36 +02:00

plugins

Merge from 5.1

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

rpl

5.2 -> 5.3

2013-02-28 21:48:47 +01:00

rpl_ndb

Merge with 5.2.

2011-12-11 11:34:44 +02:00

sphinx

use mtr_verbose() for debug output in suite.pm files

2011-03-01 18:31:33 +01:00

stress

…

sys_vars

5.2 merge.

2012-08-22 16:45:25 +02:00

vcol

MDEV-4667 DATE('string') incompability between mysql and mariadb

2013-07-03 09:46:20 +02:00