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 | 6c716007d13ffd74bb5c3dd7c512d4d7026a23d8 (patch) | |
| tree | 0bab5217d4ea83929d314c2ce29f962a949c95c8 /mysys/my_once.c | |
| parent | c3eabe01fc30ee38f64b17fabfd58c6328751660 (diff) | |
| parent | e7441f0b602735e2c40b0e0e7cfb01a2443aaa5a (diff) | |
| download | mariadb-git-6c716007d13ffd74bb5c3dd7c512d4d7026a23d8.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 'mysys/my_once.c')
| -rw-r--r-- | mysys/my_once.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_once.c b/mysys/my_once.c index b6f6656fce2..727b8477365 100644 --- a/mysys/my_once.c +++ b/mysys/my_once.c @@ -25,7 +25,8 @@ #include <m_string.h> /* - Alloc for things we don't nead to free + Alloc for things we don't nend to free run-time (that only + should be free'd on exit) SYNOPSIS my_once_alloc() @@ -100,7 +101,7 @@ void *my_once_memdup(const void *src, size_t len, myf myflags) /* - Deallocate everything used by my_once_alloc + Deallocate everything that was allocated with my_once_alloc SYNOPSIS my_once_free() |