From c1f335237bd0cbf00b6860ba5f18cd1deff7d94c Mon Sep 17 00:00:00 2001 From: Narayanan V Date: Wed, 11 Mar 2009 12:41:59 +0530 Subject: Bug#42937 strings/CHARSET_INFO.txt not included in source distributions The reference manual has instructions for adding new character sets, and refers to the string/CHARSET_INFO.txt file. This file is currently not present in the distribution. Modify the build to include this file in the distribution. strings/Makefile.am: modify EXTRA_DIST to include the CHARSET_INFO file. --- strings/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strings/Makefile.am b/strings/Makefile.am index ffca972459b..f0d6585dee4 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -52,7 +52,7 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \ strinstr-sparc.s strmake-sparc.s strmov-sparc.s \ strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \ - t_ctype.h CMakeLists.txt + t_ctype.h CMakeLists.txt CHARSET_INFO.txt libmystrings_a_LIBADD= conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c -- cgit v1.2.1 From 27e3214b494b0cec3bdb5de927d18bc04323f6fb Mon Sep 17 00:00:00 2001 From: Davi Arnaut Date: Thu, 19 Mar 2009 17:20:15 -0300 Subject: Bug#43461: invalid comparison with string literal in default.c Don't compare string literals as it results in unspecified behavior. mysys/default.c: Test for a empty string. --- mysys/default.c | 2 +- mysys/my_new.cc | 5 +++-- sql/sql_class.cc | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mysys/default.c b/mysys/default.c index 0067e95ffbe..362aa0d4605 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1083,7 +1083,7 @@ static const char **init_default_directories(MEM_ROOT *alloc) if ((env= getenv("ETC"))) errors += add_directory(alloc, env, dirs); #elif defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR != "") + if (DEFAULT_SYSCONFDIR[0]) errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); #endif /* __EMX__ || __OS2__ */ diff --git a/mysys/my_new.cc b/mysys/my_new.cc index babfe04d695..7da54ffac87 100644 --- a/mysys/my_new.cc +++ b/mysys/my_new.cc @@ -46,8 +46,9 @@ void operator delete[] (void *ptr) throw () C_MODE_START -int __cxa_pure_virtual() { - assert("Pure virtual method called." == "Aborted"); +int __cxa_pure_virtual() +{ + assert(! "Aborted: pure virtual method called."); return 0; } diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 88b7dfb46d7..74bc669a049 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1758,7 +1758,7 @@ void Query_arena::set_query_arena(Query_arena *set) void Query_arena::cleanup_stmt() { - DBUG_ASSERT("Query_arena::cleanup_stmt()" == "not implemented"); + DBUG_ASSERT(! "Query_arena::cleanup_stmt() not implemented"); } /* -- cgit v1.2.1 From 9a561879c5b21973d9b7702a1162b2795f37f910 Mon Sep 17 00:00:00 2001 From: Sergey Glukhov Date: Mon, 23 Mar 2009 16:51:39 +0400 Subject: remove compiler warnings --- client/mysqltest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 64b9f4a5a16..312012d7b8d 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -6665,7 +6665,7 @@ void init_re_comp(my_regex_t *re, const char* str) char erbuf[100]; size_t len= my_regerror(err, re, erbuf, sizeof(erbuf)); die("error %s, %d/%d `%s'\n", - re_eprint(err), len, (int)sizeof(erbuf), erbuf); + re_eprint(err), (int)len, (int)sizeof(erbuf), erbuf); } } @@ -6721,7 +6721,7 @@ int match_re(my_regex_t *re, char *str) char erbuf[100]; size_t len= my_regerror(err, re, erbuf, sizeof(erbuf)); die("error %s, %d/%d `%s'\n", - re_eprint(err), len, (int)sizeof(erbuf), erbuf); + re_eprint(err), (int)len, (int)sizeof(erbuf), erbuf); } return 0; } -- cgit v1.2.1