diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-15 17:55:01 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-15 17:55:01 +0300 |
| commit | 6a6bcc53b8767dfbb4dc86bad3e90a276c55f605 (patch) | |
| tree | 04116d0e438cfcf3a3b6a7557d5ec8c570255db6 /client | |
| parent | 3eadb135fd7b7e2d40fd6b9a819ac3245043f781 (diff) | |
| parent | ff66d65a096ec02dda1ab449d84a40361551085c (diff) | |
| download | mariadb-git-6a6bcc53b8767dfbb4dc86bad3e90a276c55f605.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 151fff914f9..c0b391dce45 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -587,9 +587,10 @@ ATTRIBUTE_NORETURN static void cleanup_and_exit(int exit_code); ATTRIBUTE_NORETURN -void really_die(const char *msg); +static void really_die(const char *msg); void report_or_die(const char *fmt, ...); -void die(const char *fmt, ...); +ATTRIBUTE_NORETURN +static void die(const char *fmt, ...); static void make_error_message(char *buf, size_t len, const char *fmt, va_list args); ATTRIBUTE_NORETURN ATTRIBUTE_FORMAT(printf, 1, 2) void abort_not_supported_test(const char *fmt, ...); @@ -1555,7 +1556,7 @@ static void make_error_message(char *buf, size_t len, const char *fmt, va_list a s+= my_snprintf(s, end -s, "\n"); } -void die(const char *fmt, ...) +static void die(const char *fmt, ...) { char buff[DIE_BUFF_SIZE]; va_list args; @@ -1564,7 +1565,7 @@ void die(const char *fmt, ...) really_die(buff); } -void really_die(const char *msg) +static void really_die(const char *msg) { static int dying= 0; fflush(stdout); |