diff options
| author | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem.bichot@oracle.com> | 2011-05-21 10:21:08 +0200 |
| commit | 3ceec2f19cff22d7b6078b6a8d5788fa19264b8a (patch) | |
| tree | 43fd6afdae9f8879ad4cdbb000497fee7cba02f4 /storage/example | |
| parent | 955cb796e7672d1186f44de84528b7b8fe47f0c9 (diff) | |
| parent | 12c42b980aa94105a9108d4f58c5dc75d96ec824 (diff) | |
| download | mariadb-git-3ceec2f19cff22d7b6078b6a8d5788fa19264b8a.tar.gz | |
Merge from 5.1.
Diffstat (limited to 'storage/example')
| -rw-r--r-- | storage/example/ha_example.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 6af471494af..0a0db105c95 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -984,7 +984,7 @@ static int show_func_example(MYSQL_THD thd, struct st_mysql_show_var *var, var->type= SHOW_CHAR; var->value= buf; // it's of SHOW_VAR_FUNC_BUFF_SIZE bytes my_snprintf(buf, SHOW_VAR_FUNC_BUFF_SIZE, - "enum_var is %u, ulong_var is %lu, %.6b", // %b is MySQL extension + "enum_var is %lu, ulong_var is %lu, %.6b", // %b is MySQL extension srv_enum_var, srv_ulong_var, "really"); return 0; } |