diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-07-09 11:02:56 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-07-09 11:02:56 +0400 |
| commit | 8a732d5a5eeb29b9fea1814cabcf083b55428939 (patch) | |
| tree | 71b05d21fad39fb10314e8b0e16e36da7c47636c /plugin | |
| parent | 58fa29e0ff35b10bbbdf605faf2592a0040214c1 (diff) | |
| parent | 762d3cb8ede0b46f101f045d862ebb64f9148771 (diff) | |
| download | mariadb-git-8a732d5a5eeb29b9fea1814cabcf083b55428939.tar.gz | |
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...
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/fulltext/plugin_example.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/fulltext/plugin_example.c b/plugin/fulltext/plugin_example.c index cc84cb6161b..328d9c0d739 100644 --- a/plugin/fulltext/plugin_example.c +++ b/plugin/fulltext/plugin_example.c @@ -210,7 +210,7 @@ static struct st_mysql_ftparser simple_parser_descriptor= static struct st_mysql_show_var simple_status[]= { - {"static", (char *)"just a static text", SHOW_CHAR}, + {"A_static", (char *)"just a static text", SHOW_CHAR}, {"called", (char *)&number_of_calls, SHOW_LONG}, {0,0,0} }; |