1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merged 5.0-bugteam -> 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov 2009-03-24 15:58:52 +02:00
commit c36e935ac2
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysqltest.cc
View File

@ -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)
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;
} }

2
mysys/default.c
View File

@ -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 */

5
mysys/my_new.cc
View File

@ -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;
} }

2
sql/opt_range.cc
View File

@ -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;

2
sql/sql_class.cc
View File

@ -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");
} }
/* /*

3
strings/Makefile.am
View File

@ -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