diff options
Diffstat (limited to 'extra')
| -rwxr-xr-x | extra/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | extra/Makefile.am | 4 | ||||
| -rw-r--r-- | extra/comp_err.c | 2 | ||||
| -rw-r--r-- | extra/yassl/include/yassl_int.hpp | 2 | ||||
| -rw-r--r-- | extra/yassl/src/yassl_int.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 44c96ccbb86..b67fdfa601f 100755 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -29,8 +29,8 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/include/mysqld_error.h --header_file=${PROJECT_SOURCE_DIR}/include/mysqld_error.h --name_file=${PROJECT_SOURCE_DIR}/include/mysqld_ername.h --state_file=${PROJECT_SOURCE_DIR}/include/sql_state.h - --in_file=${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt - DEPENDS comp_err ${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt) + --in_file=${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt + DEPENDS comp_err ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt) ADD_CUSTOM_TARGET(GenError ALL diff --git a/extra/Makefile.am b/extra/Makefile.am index 75422c4ee11..1552a5836ed 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -30,7 +30,7 @@ DIST_SUBDIRS = yassl # NOTE Built files should depend on their sources to avoid # the built files being rebuilt in source dist $(top_builddir)/include/mysqld_error.h: comp_err.c \ - $(top_srcdir)/sql/share/errmsg.txt + $(top_srcdir)/sql/share/errmsg-utf8.txt $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT) $(top_builddir)/extra/comp_err$(EXEEXT) \ --charset=$(top_srcdir)/sql/share/charsets \ @@ -38,7 +38,7 @@ $(top_builddir)/include/mysqld_error.h: comp_err.c \ --header_file=$(top_builddir)/include/mysqld_error.h \ --name_file=$(top_builddir)/include/mysqld_ername.h \ --state_file=$(top_builddir)/include/sql_state.h \ - --in_file=$(top_srcdir)/sql/share/errmsg.txt + --in_file=$(top_srcdir)/sql/share/errmsg-utf8.txt $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h diff --git a/extra/comp_err.c b/extra/comp_err.c index e36e85f6f0c..405f745eaf3 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -39,7 +39,7 @@ static char *OUTFILE= (char*) "errmsg.sys"; static char *HEADERFILE= (char*) "mysqld_error.h"; static char *NAMEFILE= (char*) "mysqld_ername.h"; static char *STATEFILE= (char*) "sql_state.h"; -static char *TXTFILE= (char*) "../sql/share/errmsg.txt"; +static char *TXTFILE= (char*) "../sql/share/errmsg-utf8.txt"; static char *DATADIRECTORY= (char*) "../sql/share/"; #ifndef DBUG_OFF static char *default_dbug_option= (char*) "d:t:O,/tmp/comp_err.trace"; diff --git a/extra/yassl/include/yassl_int.hpp b/extra/yassl/include/yassl_int.hpp index d18dc41860c..1e761f559e2 100644 --- a/extra/yassl/include/yassl_int.hpp +++ b/extra/yassl/include/yassl_int.hpp @@ -441,7 +441,7 @@ public: const Ciphers& GetCiphers() const; const DH_Parms& GetDH_Parms() const; const Stats& GetStats() const; - const VerifyCallback getVerifyCallback() const; + VerifyCallback getVerifyCallback() const; pem_password_cb GetPasswordCb() const; void* GetUserData() const; bool GetSessionCacheOff() const; diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp index b7f91d72166..8e4a9aa95ec 100644 --- a/extra/yassl/src/yassl_int.cpp +++ b/extra/yassl/src/yassl_int.cpp @@ -1833,7 +1833,7 @@ SSL_CTX::GetCA_List() const } -const VerifyCallback SSL_CTX::getVerifyCallback() const +VerifyCallback SSL_CTX::getVerifyCallback() const { return verifyCallback_; } |