diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
| commit | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (patch) | |
| tree | b7447115f45de0f03bbe18c26fc0866367483066 /include/mysql | |
| parent | db9e41ddc31f2e705a54132cf69c781e1cc60f07 (diff) | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| download | mariadb-git-780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/service_my_print_error.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/mysql/service_my_print_error.h b/include/mysql/service_my_print_error.h index e9af51c20cc..74ba6a2adb8 100644 --- a/include/mysql/service_my_print_error.h +++ b/include/mysql/service_my_print_error.h @@ -51,11 +51,9 @@ extern struct my_print_error_service_st { #define my_printv_error(A,B,C,D) my_print_error_service->my_printv_error_func(A,B,C,D) #else -#ifndef MY_ERROR_DEFINED extern void my_error(unsigned int nr, unsigned long MyFlags, ...); extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); -#endif /* MY_ERROR_DEFINED */ #endif /* MYSQL_DYNAMIC_PLUGIN */ #ifdef __cplusplus |