Commit c36e935a authored by Georgi Kodinov's avatar Georgi Kodinov

merged 5.0-bugteam -> 5.1-bugteam

parents 515e83cc dad07ffe
No related merge requests found
...@@ -7169,7 +7169,7 @@ void init_re_comp(my_regex_t *re, const char* str) ...@@ -7169,7 +7169,7 @@ void init_re_comp(my_regex_t *re, const char* str)
char erbuf[100]; char erbuf[100];
int len= my_regerror(err, re, erbuf, sizeof(erbuf)); int len= my_regerror(err, re, erbuf, sizeof(erbuf));
die("error %s, %d/%d `%s'\n", die("error %s, %d/%d `%s'\n",
re_eprint(err), len, (int)sizeof(erbuf), erbuf); re_eprint(err), (int)len, (int)sizeof(erbuf), erbuf);
} }
} }
...@@ -7225,7 +7225,7 @@ int match_re(my_regex_t *re, char *str) ...@@ -7225,7 +7225,7 @@ int match_re(my_regex_t *re, char *str)
char erbuf[100]; char erbuf[100];
int len= my_regerror(err, re, erbuf, sizeof(erbuf)); int len= my_regerror(err, re, erbuf, sizeof(erbuf));
die("error %s, %d/%d `%s'\n", 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; return 0;
} }
......
...@@ -1127,7 +1127,7 @@ static const char **init_default_directories(MEM_ROOT *alloc) ...@@ -1127,7 +1127,7 @@ static const char **init_default_directories(MEM_ROOT *alloc)
errors += add_directory(alloc, "/etc/mysql/", dirs); errors += add_directory(alloc, "/etc/mysql/", dirs);
#if defined(DEFAULT_SYSCONFDIR) #if defined(DEFAULT_SYSCONFDIR)
if (DEFAULT_SYSCONFDIR != "") if (DEFAULT_SYSCONFDIR[0])
errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
#endif /* DEFAULT_SYSCONFDIR */ #endif /* DEFAULT_SYSCONFDIR */
......
...@@ -46,8 +46,9 @@ void operator delete[] (void *ptr) throw () ...@@ -46,8 +46,9 @@ void operator delete[] (void *ptr) throw ()
C_MODE_START C_MODE_START
int __cxa_pure_virtual() { int __cxa_pure_virtual()
assert("Pure virtual method called." == "Aborted"); {
assert(! "Aborted: pure virtual method called.");
return 0; return 0;
} }
......
...@@ -9494,7 +9494,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) ...@@ -9494,7 +9494,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree)
} }
/* If we got to this point, cur_index_info passes the test. */ /* If we got to this point, cur_index_info passes the test. */
key_infix_parts= cur_key_infix_len ? key_infix_parts= cur_key_infix_len ? (uint)
(first_non_infix_part - first_non_group_part) : 0; (first_non_infix_part - first_non_group_part) : 0;
cur_used_key_parts= cur_group_key_parts + key_infix_parts; cur_used_key_parts= cur_group_key_parts + key_infix_parts;
......
...@@ -2303,7 +2303,7 @@ void Query_arena::set_query_arena(Query_arena *set) ...@@ -2303,7 +2303,7 @@ void Query_arena::set_query_arena(Query_arena *set)
void Query_arena::cleanup_stmt() void Query_arena::cleanup_stmt()
{ {
DBUG_ASSERT("Query_arena::cleanup_stmt()" == "not implemented"); DBUG_ASSERT(! "Query_arena::cleanup_stmt() not implemented");
} }
/* /*
......
...@@ -53,7 +53,8 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc ...@@ -53,7 +53,8 @@ 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 \ bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \
strinstr-sparc.s strmake-sparc.s strmov-sparc.s \ strinstr-sparc.s strmake-sparc.s strmov-sparc.s \
strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \ strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
t_ctype.h my_strchr.c CMakeLists.txt t_ctype.h my_strchr.c CMakeLists.txt \
CHARSET_INFO.txt
libmystrings_a_LIBADD= libmystrings_a_LIBADD=
conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment