diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-07-09 10:54:47 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-07-09 10:54:47 +0400 |
| commit | 762d3cb8ede0b46f101f045d862ebb64f9148771 (patch) | |
| tree | f14b1963373ec9476a2335186e80b354d3857d2b /plugin | |
| parent | 4ee5ae3e7ff418d8912920357427297f1465f407 (diff) | |
| parent | 48b403cd65a680c5ea526225cad82a44779d0178 (diff) | |
| download | mariadb-git-762d3cb8ede0b46f101f045d862ebb64f9148771.tar.gz | |
Merge from 5.1
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:
Sergei Golubchik 2013-07-06 Bug #69682 - mysqld crashes after uninstall ...
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} }; |