Commit cb271ffe authored by unknown's avatar unknown
Browse files

Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


innobase/include/univ.i:
  Auto merged
sql/item_create.cc:
  Auto merged
parents 5afe81ae ea279502

innobase/include/univ.i

+2 −4
Original line number Diff line number Diff line
@@ -80,10 +80,8 @@ memory is read outside the allocated blocks. */ 


/* Make a non-inline debug version */



#ifdef DBUG_ON

# define UNIV_DEBUG

#endif /* DBUG_ON */

/*

#define UNIV_DEBUG

#define UNIV_MEM_DEBUG

#define UNIV_IBUF_DEBUG

#define UNIV_SYNC_DEBUG

sql/item_create.cc

+3 −2
Original line number Diff line number Diff line
@@ -370,13 +370,14 @@ Item *create_func_space(Item *a) 
  {

    uint dummy_errors;

    sp= new Item_string("",0,cs);

    if (sp)

      sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors);

  }

  else

  {

    sp= new Item_string(" ",1,cs);

  }

  return new Item_func_repeat(sp, a);

  return sp ? new Item_func_repeat(sp, a) : 0;

}



Item *create_func_soundex(Item* a)