bzr commit into mysql-6.0-bugteam branch (joro:3159)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/merge-6.0-bugteam/ based on revid:horst@stripped

 3159 Georgi Kodinov	2009-03-24 [merge]
      merged 5.1-bugteam-> 6.0-bugteam

    modified:
      client/mysqltest.cc
      mysys/default.c
      mysys/my_new.cc
      sql/opt_range.cc
      sql/sql_class.cc
      strings/Makefile.am
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2009-03-23 09:52:54 +0000
+++ b/client/mysqltest.cc	2009-03-24 14:24:44 +0000
@@ -7217,7 +7217,7 @@ void init_re_comp(my_regex_t *re, const 
     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);
   }
 }
 
@@ -7273,7 +7273,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;
 }

=== modified file 'mysys/default.c'
--- a/mysys/default.c	2009-03-19 16:42:23 +0000
+++ b/mysys/default.c	2009-03-24 14:24:44 +0000
@@ -183,7 +183,7 @@ int my_search_option_files(const char *c
     /* Handle --defaults-group-suffix= */
     uint i;
     const char **extra_groups;
-    const uint instance_len= strlen(my_defaults_group_suffix); 
+    const size_t instance_len= strlen(my_defaults_group_suffix); 
     struct handle_option_ctx *ctx= (struct handle_option_ctx*) func_ctx;
     char *ptr;
     TYPELIB *group= ctx->group;
@@ -195,12 +195,12 @@ int my_search_option_files(const char *c
     
     for (i= 0; i < group->count; i++)
     {
-      uint len;
+      size_t len;
       extra_groups[i]= group->type_names[i]; /** copy group */
       
       len= strlen(extra_groups[i]);
-      if (!(ptr= alloc_root(ctx->alloc, len+instance_len+1)))
-        DBUG_RETURN(2);
+      if (!(ptr= alloc_root(ctx->alloc, (uint) (len+instance_len+1))))
+       DBUG_RETURN(2);
       
       extra_groups[i+group->count]= ptr;
       
@@ -1007,7 +1007,7 @@ void print_defaults(const char *conf_fil
 static int add_directory(MEM_ROOT *alloc, const char *dir, const char **dirs)
 {
   char buf[FN_REFLEN];
-  uint len;
+  size_t len;
   char *p;
   my_bool err __attribute__((unused));
 
@@ -1041,14 +1041,14 @@ static size_t my_get_system_windows_dire
                                              "GetSystemWindowsDirectoryA");
 
   if (func_ptr)
-    return func_ptr(buffer, size);
+    return func_ptr(buffer, (uint) size);
 
   /*
     Windows NT 4.0 Terminal Server Edition:  
     To retrieve the shared Windows directory, call GetSystemDirectory and
     trim the "System32" element from the end of the returned path.
   */
-  count= GetSystemDirectory(buffer, size);
+  count= GetSystemDirectory(buffer, (uint) size);
   if (count > 8 && stricmp(buffer+(count-8), "\\System32") == 0)
   {
     count-= 8;
@@ -1127,7 +1127,7 @@ static const char **init_default_directo
   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 */
 

=== modified file 'mysys/my_new.cc'
--- a/mysys/my_new.cc	2006-12-23 19:17:15 +0000
+++ b/mysys/my_new.cc	2009-03-19 20:20:15 +0000
@@ -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;
 }
 

=== modified file 'sql/opt_range.cc'
--- a/sql/opt_range.cc	2009-03-19 15:37:37 +0000
+++ b/sql/opt_range.cc	2009-03-24 14:24:44 +0000
@@ -9603,7 +9603,7 @@ get_best_group_min_max(PARAM *param, SEL
     }
 
     /* 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;
 

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2009-03-09 12:49:47 +0000
+++ b/sql/sql_class.cc	2009-03-24 14:24:44 +0000
@@ -2487,7 +2487,7 @@ void Query_arena::set_query_arena(Query_
 
 void Query_arena::cleanup_stmt()
 {
-  DBUG_ASSERT("Query_arena::cleanup_stmt()" == "not implemented");
+  DBUG_ASSERT(! "Query_arena::cleanup_stmt() not implemented");
 }
 
 /*

=== modified file 'strings/Makefile.am'
--- a/strings/Makefile.am	2009-01-07 10:58:33 +0000
+++ b/strings/Makefile.am	2009-03-24 14:24:44 +0000
@@ -65,7 +65,8 @@ EXTRA_DIST 	= ctype-big5.c ctype-cp932.c
 			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
 
 conf_to_src_SOURCES = conf_to_src.c 
 conf_to_src_LDADD= libmystringslt.la


Attachment: [text/bzr-bundle] bzr/[e-mail]