List:Commits« Previous MessageNext Message »
From:konstantin Date:June 27 2006 10:51am
Subject:bk commit into 5.0 tree (konstantin:1.2203) BUG#16206
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2203 06/06/27 14:51:05 konstantin@stripped +10 -0
  Fix compilation failures on Windows caused by the patch for Bug#17199.
  Fix a minor issue with Bug#16206 (bdb.test failed if compiling without
  blackhole)l

  sql/table.h
    1.128 06/06/27 14:51:00 konstantin@stripped +2 -1
    Change the type of db_length to uint from uint32: LEX_STRING uses uint for 
    length, we need a small and consistent set of types to store length to 
    minimize cast and compile failures.

  sql/sql_class.h
    1.291 06/06/27 14:51:00 konstantin@stripped +1 -1
    Change db_length type to uint from uint32 (see also table.h)

  sql/set_var.cc
    1.156 06/06/27 14:51:00 konstantin@stripped +1 -1
    my_strdup_with_length: const byte * -> const char *

  sql/log_event.cc
    1.207 06/06/27 14:51:00 konstantin@stripped +2 -2
    my_strdup_with_length: const byte * -> const char *

  sql/ha_federated.cc
    1.61 06/06/27 14:51:00 konstantin@stripped +1 -2
    my_strdup_with_length: const byte * -> const char *

  mysys/safemalloc.c
    1.25 06/06/27 14:50:59 konstantin@stripped +1 -1
    my_strdup_with_length: const byte * -> const char *

  mysys/my_malloc.c
    1.10 06/06/27 14:50:59 konstantin@stripped +1 -1
    my_strdup_with_length: const byte * -> const char *

  mysql-test/t/bdb.test
    1.53 06/06/27 14:50:59 konstantin@stripped +1 -1
    Remove dependency on an optional engine.

  mysql-test/r/bdb.result
    1.51 06/06/27 14:50:59 konstantin@stripped +2 -2
    Remove dependency on an optional engine (updated test results).

  include/my_sys.h
    1.181 06/06/27 14:50:59 konstantin@stripped +1 -1
    Change declaration of my_strdup_with_length to accept const char *,
    not const byte *: in 5 places out of 6 where this function is used,
    it's being passed char *, not byte *

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	bodhi.netgear
# Root:	/opt/local/work/mysql-5.0-17199

--- 1.180/include/my_sys.h	2006-05-15 20:07:52 +04:00
+++ 1.181/include/my_sys.h	2006-06-27 14:50:59 +04:00
@@ -157,7 +157,7 @@
 extern void my_no_flags_free(gptr ptr);
 extern gptr my_memdup(const byte *from,uint length,myf MyFlags);
 extern char *my_strdup(const char *from,myf MyFlags);
-extern char *my_strdup_with_length(const byte *from, uint length,
+extern char *my_strdup_with_length(const char *from, uint length,
 				   myf MyFlags);
 /* we do use FG (as a no-op) in below so that a typo on FG is caught */
 #define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))

--- 1.9/mysys/my_malloc.c	2004-08-23 14:46:49 +04:00
+++ 1.10/mysys/my_malloc.c	2006-06-27 14:50:59 +04:00
@@ -83,7 +83,7 @@
 }
 
 
-char *my_strdup_with_length(const byte *from, uint length, myf my_flags)
+char *my_strdup_with_length(const char *from, uint length, myf my_flags)
 {
   gptr ptr;
   if ((ptr=my_malloc(length+1,my_flags)) != 0)

--- 1.24/mysys/safemalloc.c	2004-08-23 14:46:49 +04:00
+++ 1.25/mysys/safemalloc.c	2006-06-27 14:50:59 +04:00
@@ -525,7 +525,7 @@
 } /* _my_strdup */
 
 
-char *_my_strdup_with_length(const byte *from, uint length,
+char *_my_strdup_with_length(const char *from, uint length,
 			     const char *filename, uint lineno,
 			     myf MyFlags)
 {

--- 1.206/sql/log_event.cc	2006-06-27 00:50:50 +04:00
+++ 1.207/sql/log_event.cc	2006-06-27 14:51:00 +04:00
@@ -3123,7 +3123,7 @@
                       llstr(pos_arg, buff), flags));
 #endif
   if (flags & DUP_NAME)
-    new_log_ident= my_strdup_with_length((const byte*) new_log_ident_arg,
+    new_log_ident= my_strdup_with_length(new_log_ident_arg,
                                          ident_len, MYF(MY_WME));
   DBUG_VOID_RETURN;
 }
@@ -3147,7 +3147,7 @@
                      (header_size+post_header_len)); 
   ident_offset = post_header_len; 
   set_if_smaller(ident_len,FN_REFLEN-1);
-  new_log_ident= my_strdup_with_length((byte*) buf + ident_offset,
+  new_log_ident= my_strdup_with_length(buf + ident_offset,
                                        (uint) ident_len,
                                        MYF(MY_WME));
   DBUG_VOID_RETURN;

--- 1.290/sql/sql_class.h	2006-06-27 00:50:50 +04:00
+++ 1.291/sql/sql_class.h	2006-06-27 14:51:00 +04:00
@@ -1300,7 +1300,7 @@
   pthread_t  real_id;
   uint	     tmp_table, global_read_lock;
   uint	     server_status,open_options,system_thread;
-  uint32     db_length;
+  uint       db_length;
   uint       select_number;             //number of select (used for EXPLAIN)
   /* variables.transaction_isolation is reset to this after each commit */
   enum_tx_isolation session_tx_isolation;

--- 1.127/sql/table.h	2006-05-10 17:40:15 +04:00
+++ 1.128/sql/table.h	2006-06-27 14:51:00 +04:00
@@ -599,7 +599,8 @@
   thr_lock_type lock_type;
   uint		outer_join;		/* Which join type */
   uint		shared;			/* Used in multi-upd */
-  uint32        db_length, table_name_length;
+  uint          db_length;
+  uint32        table_name_length;
   bool          updatable;		/* VIEW/TABLE can be updated now */
   bool		straight;		/* optimize with prev table */
   bool          updating;               /* for replicate-do/ignore table */

--- 1.155/sql/set_var.cc	2006-05-09 03:38:42 +04:00
+++ 1.156/sql/set_var.cc	2006-06-27 14:51:00 +04:00
@@ -1133,7 +1133,7 @@
   uint new_length= (var ? var->value->str_value.length() : 0);
   if (!old_value)
     old_value= (char*) "";
-  if (!(res= my_strdup_with_length((byte*)old_value, new_length, MYF(0))))
+  if (!(res= my_strdup_with_length(old_value, new_length, MYF(0))))
     return 1;
   /*
     Replace the old value in such a way that the any thread using

--- 1.60/sql/ha_federated.cc	2006-02-28 13:17:35 +03:00
+++ 1.61/sql/ha_federated.cc	2006-06-27 14:51:00 +04:00
@@ -632,8 +632,7 @@
   DBUG_PRINT("info", ("Length %d \n", table->s->connect_string.length));
   DBUG_PRINT("info", ("String %.*s \n", table->s->connect_string.length, 
                       table->s->connect_string.str));
-  share->scheme= my_strdup_with_length((const byte*)table->s->
-                                       connect_string.str, 
+  share->scheme= my_strdup_with_length(table->s->connect_string.str,
                                        table->s->connect_string.length,
                                        MYF(0));
 

--- 1.50/mysql-test/r/bdb.result	2006-06-12 16:54:40 +04:00
+++ 1.51/mysql-test/r/bdb.result	2006-06-27 14:50:59 +04:00
@@ -1930,7 +1930,7 @@
 drop table t1;
 set autocommit=1;
 reset master;
-create table bug16206 (a int) engine=         blackhole;
+create table bug16206 (a int);
 insert into bug16206 values(1);
 start transaction;
 insert into bug16206 values(2);
@@ -1938,7 +1938,7 @@
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4
-f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         blackhole
+f	n	Query	1	n	use `test`; create table bug16206 (a int)
 f	n	Query	1	n	use `test`; insert into bug16206 values(1)
 f	n	Query	1	n	use `test`; insert into bug16206 values(2)
 drop table bug16206;

--- 1.52/mysql-test/t/bdb.test	2006-06-12 16:54:40 +04:00
+++ 1.53/mysql-test/t/bdb.test	2006-06-27 14:50:59 +04:00
@@ -1028,7 +1028,7 @@
 let $VERSION=`select version()`;
 
 reset master;
-create table bug16206 (a int) engine=         blackhole;
+create table bug16206 (a int);
 insert into bug16206 values(1);
 start transaction;
 insert into bug16206 values(2);
Thread
bk commit into 5.0 tree (konstantin:1.2203) BUG#16206konstantin27 Jun