diff options
author | unknown <msvensson@neptunus.(none)> | 2006-10-24 16:00:42 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 16:00:42 +0200 |
commit | c9ef0344f8f32a76d794ddbe9ade39b224c5ceb9 (patch) | |
tree | 9526a5bcc35bd0338b4ccb9cd7ee7c8724a8a007 /client | |
parent | 752e5f1ec77f79009804a6ed316843b184b46394 (diff) | |
parent | 7e1fcb649f9e2e7a113da14db8bd290c8dc97f66 (diff) | |
download | mariadb-git-c9ef0344f8f32a76d794ddbe9ade39b224c5ceb9.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqltest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 5bc132a874f..9f41586afae 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -398,13 +398,13 @@ TYPELIB command_typelib= {array_elements(command_names),"", DYNAMIC_STRING ds_res, ds_progress, ds_warning_messages; void die(const char *fmt, ...) - /* ATTRIBUTE_FORMAT(printf, 1, 2) */; + ATTRIBUTE_FORMAT(printf, 1, 2); void abort_not_supported_test(const char *fmt, ...) - /* ATTRIBUTE_FORMAT(printf, 1, 2) */; + ATTRIBUTE_FORMAT(printf, 1, 2); void verbose_msg(const char *fmt, ...) - /* ATTRIBUTE_FORMAT(printf, 1, 2) */; + ATTRIBUTE_FORMAT(printf, 1, 2); void warning_msg(const char *fmt, ...) - /* ATTRIBUTE_FORMAT(printf, 1, 2) */; + ATTRIBUTE_FORMAT(printf, 1, 2); VAR* var_from_env(const char *, const char *); VAR* var_init(VAR* v, const char *name, int name_len, const char *val, |