diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-28 15:54:16 +0300 |
| commit | 85d5a08b51e24af57120068bed4534e4c1e889f4 (patch) | |
| tree | 0bab5217d4ea83929d314c2ce29f962a949c95c8 /sql/sql_cache.h | |
| parent | ece5ad57e9b2505732be4b043440d9e5a5dc3b9a (diff) | |
| parent | 31cd0643ae1b5670d4ebd89eb001f2bcda400d2a (diff) | |
| download | mariadb-git-85d5a08b51e24af57120068bed4534e4c1e889f4.tar.gz | |
Manual merge of WL#4738 from mysql-next-mr:
- backported code that handles %f/%g arguments in
my_vsnprintf.c from 6.0
- backported %f/%g tests in unittest/mysys/my_vsnprintf-t.c
from 6.0
- replaced snprintf("%g") in sql/set_var.cc with my_gcvt()
- removed unnecessary "--replace-result"s for Windows in
mysql-test/suite/sys_vars/t/long_query_time_basic.test
- some test results adjustments
Diffstat (limited to 'sql/sql_cache.h')
| -rw-r--r-- | sql/sql_cache.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_cache.h b/sql/sql_cache.h index 695d6fb4db3..33e535b2580 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -503,5 +503,4 @@ protected: }; extern Query_cache query_cache; -extern TYPELIB query_cache_type_typelib; #endif |