Commit af48d4a2 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020
parents a2f192f1 77f51bf1

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -74,5 +74,6 @@ hours: 
[jonas:]checkout:get

[tomas:]checkout:get

[guilhem:]checkout:get

[pekka:]checkout:get

checkout:edit

eoln:unix

client/mysqlslap.c

+2 −2
Original line number Diff line number Diff line
@@ -1184,7 +1184,7 @@ parse_delimiter(const char *script, statement **stmt, char delm) 
       tmp= tmp->next)

  {

    count++;

    tmp->string= my_strdup_with_length(ptr, (size_t)(retstr - ptr), MYF(MY_FAE));

    tmp->string= my_strndup(ptr, (size_t)(retstr - ptr), MYF(MY_FAE));

    tmp->length= (size_t)(retstr - ptr);

    DBUG_PRINT("info", (" Creating : %.*s\n", (uint)tmp->length, tmp->string));

    ptr+= retstr - ptr + 1;
@@ -1195,7 +1195,7 @@ parse_delimiter(const char *script, statement **stmt, char delm) 


  if (ptr != script+length)

  {

    tmp->string= my_strdup_with_length(ptr, (size_t)((script + length) - ptr), 

    tmp->string= my_strndup(ptr, (size_t)((script + length) - ptr), 

                                       MYF(MY_FAE));

    tmp->length= (size_t)((script + length) - ptr);

    DBUG_PRINT("info", (" Creating : %.*s\n", (uint)tmp->length, tmp->string));

extra/comp_err.c

+3 −3
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ static char *get_word(char **str) 
  DBUG_ENTER("get_word");



  *str= find_end_of_word(start);

  DBUG_RETURN(my_strdup_with_length(start, (uint) (*str - start),

  DBUG_RETURN(my_strndup(start, (uint) (*str - start),

				    MYF(MY_WME | MY_FAE)));

}
@@ -672,7 +672,7 @@ static struct message *parse_message_string(struct message *new_message, 
  while (*str != ' ' && *str != '\t' && *str)

    str++;

  if (!(new_message->lang_short_name=

	my_strdup_with_length(start, (uint) (str - start),

	my_strndup(start, (uint) (str - start),

			      MYF(MY_WME | MY_FAE))))

    DBUG_RETURN(0);				/* Fatal error */

  DBUG_PRINT("info", ("msg_slang: %s", new_message->lang_short_name));
@@ -692,7 +692,7 @@ static struct message *parse_message_string(struct message *new_message, 
  start= str + 1;

  str= parse_text_line(start);



  if (!(new_message->text= my_strdup_with_length(start, (uint) (str - start),

  if (!(new_message->text= my_strndup(start, (uint) (str - start),

						 MYF(MY_WME | MY_FAE))))

    DBUG_RETURN(0);				/* Fatal error */

  DBUG_PRINT("info", ("msg_text: %s", new_message->text));

include/my_sys.h

+3 −3
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define my_free(PTR,FLAG) _myfree((PTR), __FILE__, __LINE__,FLAG)

#define my_memdup(A,B,C) _my_memdup((A),(B), __FILE__,__LINE__,C)

#define my_strdup(A,C) _my_strdup((A), __FILE__,__LINE__,C)

#define my_strdup_with_length(A,B,C) _my_strdup_with_length((A),(B),__FILE__,__LINE__,C)

#define my_strndup(A,B,C) _my_strndup((A),(B),__FILE__,__LINE__,C)

#define TRASH(A,B) bfill(A, B, 0x8F)

#define QUICK_SAFEMALLOC sf_malloc_quick=1

#define NORMAL_SAFEMALLOC sf_malloc_quick=0
@@ -158,7 +158,7 @@ extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags); 
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_strndup(const byte *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))
@@ -597,7 +597,7 @@ extern gptr _my_memdup(const byte *from,uint length, 
		       const char *sFile, uint uLine,myf MyFlag);

extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,

			    myf MyFlag);

extern char *_my_strdup_with_length(const byte *from, uint length,

extern char *_my_strndup(const byte *from, uint length,

				    const char *sFile, uint uLine,

				    myf MyFlag);

mysql-test/r/partition_mgm_err.result

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ ALTER TABLE t1 DROP PARTITION x1; 
ALTER TABLE t1 DROP PARTITION x0;

ERROR HY000: Cannot remove all partitions, use DROP TABLE instead

DROP TABLE t1;

INSERT INTO t1 VALUES (15);

DROP TABLE t1;

CREATE TABLE t1 ( id INT NOT NULL,

fname VARCHAR(50) NOT NULL,

lname VARCHAR(50) NOT NULL,