diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-03-24 15:58:52 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-03-24 15:58:52 +0200 |
| commit | 706a0a39ed3f6ca0f582d3c0946fce6e98062534 (patch) | |
| tree | 52d5e2538b0d3d438c092ff518220c8a1b274613 | |
| parent | 8ac45fb09d145d284aa78e54473748d2c82b23cd (diff) | |
| parent | 84a63525d5d54af1dce105dd01f3708268f5e1ee (diff) | |
| download | mariadb-git-706a0a39ed3f6ca0f582d3c0946fce6e98062534.tar.gz | |
merged 5.0-bugteam -> 5.1-bugteam
| -rw-r--r-- | client/mysqltest.cc | 4 | ||||
| -rw-r--r-- | mysys/default.c | 2 | ||||
| -rw-r--r-- | mysys/my_new.cc | 5 | ||||
| -rw-r--r-- | sql/opt_range.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 | ||||
| -rw-r--r-- | strings/Makefile.am | 3 |
6 files changed, 10 insertions, 8 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 6ac130d4744..fdd4ff141bc 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -7169,7 +7169,7 @@ void init_re_comp(my_regex_t *re, const char* str) char erbuf[100]; int 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); } } @@ -7225,7 +7225,7 @@ int match_re(my_regex_t *re, char *str) char erbuf[100]; int 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; } diff --git a/mysys/default.c b/mysys/default.c index ce997f2556a..1c021b4584f 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1127,7 +1127,7 @@ static const char **init_default_directories(MEM_ROOT *alloc) errors += add_directory(alloc, "/etc/mysql/", dirs); #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR != "") + if (DEFAULT_SYSCONFDIR[0]) errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); #endif /* DEFAULT_SYSCONFDIR */ 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/opt_range.cc b/sql/opt_range.cc index 1184068a377..147874611ce 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -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. */ - key_infix_parts= cur_key_infix_len ? + key_infix_parts= cur_key_infix_len ? (uint) (first_non_infix_part - first_non_group_part) : 0; cur_used_key_parts= cur_group_key_parts + key_infix_parts; diff --git a/sql/sql_class.cc b/sql/sql_class.cc index cd00d0e20f1..945a0484068 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2303,7 +2303,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"); } /* diff --git a/strings/Makefile.am b/strings/Makefile.am index b3792d308c4..ddd41e627dc 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -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 \ strinstr-sparc.s strmake-sparc.s strmov-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= conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c |