diff options
| author | unknown <serg@serg.mylan> | 2005-01-26 08:57:43 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-26 08:57:43 +0100 |
| commit | ea2795025e4172437f69e6c5819671c5b93c8aae (patch) | |
| tree | ac2e07e916d252f97c85e54366b9186714597c3d | |
| parent | ffc492cdd1bef9ac3fa24e453f4e5c117a1caf41 (diff) | |
| download | mariadb-git-ea2795025e4172437f69e6c5819671c5b93c8aae.tar.gz | |
innobase/include/univ.i
remove a change that broke the test
innobase/include/univ.i:
remove a change that broke the test
sql/item_create.cc:
better fix
| -rw-r--r-- | innobase/include/univ.i | 6 | ||||
| -rw-r--r-- | sql/item_create.cc | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index c6ab258d3b7..625978ffc38 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -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) diff --git a/sql/item_create.cc b/sql/item_create.cc index 99db184e71f..d959a6f393a 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -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) |