1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

innobase/include/univ.i

Browse Source 
remove a change that broke the test


innobase/include/univ.i:
  remove a change that broke the test
sql/item_create.cc:
  better fix
This commit is contained in:
unknown 2005-01-26 08:57:43 +01:00
parent ffc492cdd1
commit ea2795025e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
innobase/include/univ.i
View File

@ -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
@ -121,7 +119,7 @@ by one. */
/* Definition for inline version */
#ifdef __WIN__
#define UNIV_INLINE __inline
#define UNIV_INLINE __inline
#else
/* config.h contains the right def for 'inline' for the current compiler */
#if (__GNUC__ == 2)

5
sql/item_create.cc
View File

@ -377,13 +377,14 @@ Item *create_func_space(Item *a)
{
uint dummy_errors;
sp= new Item_string("",0,cs);
sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors);
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)