diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 20:38:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 20:38:59 +0200 |
| commit | e1f681c99b3e5462c033aaafa94ac295e626cde2 (patch) | |
| tree | 2da5eff1a0d03831c2d85b32a7bc3df6ec37b522 /storage/example | |
| parent | 52c84d144d3b07966d9b3bab8694eb012eef69ce (diff) | |
| parent | 807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff) | |
| download | mariadb-git-e1f681c99b3e5462c033aaafa94ac295e626cde2.tar.gz | |
10.0-base -> 10.0-monty
Diffstat (limited to 'storage/example')
| -rw-r--r-- | storage/example/ha_example.cc | 5 | ||||
| -rw-r--r-- | storage/example/mysql-test/mtr/suite.pm | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 91ead36fcea..98968d0b5b5 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -1095,7 +1095,8 @@ static struct st_mysql_sys_var* example_system_variables[]= { NULL }; -// this is an example of SHOW_FUNC and of my_snprintf() service +// this is an example of SHOW_SIMPLE_FUNC and of my_snprintf() service +// If this function would return an array, one should use SHOW_FUNC static int show_func_example(MYSQL_THD thd, struct st_mysql_show_var *var, char *buf) { @@ -1109,7 +1110,7 @@ static int show_func_example(MYSQL_THD thd, struct st_mysql_show_var *var, static struct st_mysql_show_var func_status[]= { - {"example_func_example", (char *)show_func_example, SHOW_FUNC}, + {"example_func_example", (char *)show_func_example, SHOW_SIMPLE_FUNC}, {0,0,SHOW_UNDEF} }; diff --git a/storage/example/mysql-test/mtr/suite.pm b/storage/example/mysql-test/mtr/suite.pm new file mode 100644 index 00000000000..f7ff42241fe --- /dev/null +++ b/storage/example/mysql-test/mtr/suite.pm @@ -0,0 +1,8 @@ +package My::Suite::MTR::Example; + +@ISA = qw(My::Suite); + +sub skip_combinations {( + 't/combs.combinations' => [ 'c1' ], +)} +bless { }; |