diff options
| author | Monty <monty@mariadb.org> | 2017-05-07 18:26:10 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-05-08 02:33:35 +0300 |
| commit | 1e04ad284c6ac0a9ce433f827bc6dbfbd6029007 (patch) | |
| tree | ff59557c55b06495d93a3420e8aac09588a87a9d /storage/myisam | |
| parent | 276b0c8ef03046cc210e4eeab7231cb8d9f16bac (diff) | |
| download | mariadb-git-1e04ad284c6ac0a9ce433f827bc6dbfbd6029007.tar.gz | |
Fixed compiler warnings and warnings from build.tags
Other things
- Ensure that ut_d() is set to EXPR if ut_ad() is DEBUG_ASSERT()
If not, we will get a crash in purge_sys_t::~purge_sys_t() as
this ut_ad() code expect's that the ut_d() codes has been executed
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ft_update.c | 2 | ||||
| -rw-r--r-- | storage/myisam/mi_create.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/storage/myisam/ft_update.c b/storage/myisam/ft_update.c index 8f437476121..f851c0236ae 100644 --- a/storage/myisam/ft_update.c +++ b/storage/myisam/ft_update.c @@ -28,6 +28,8 @@ void _mi_ft_segiterator_init(MI_INFO *info, uint keynr, const uchar *record, ftsi->num=info->s->keyinfo[keynr].keysegs; ftsi->seg=info->s->keyinfo[keynr].seg; ftsi->rec=record; + ftsi->pos= 0; /* Avoid warnings from gcc */ + ftsi->len= 0; /* Avoid warnings from gcc */ DBUG_VOID_RETURN; } diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c index c0967a60d13..ab45a16a96c 100644 --- a/storage/myisam/mi_create.c +++ b/storage/myisam/mi_create.c @@ -47,7 +47,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, uint internal_table= flags & HA_CREATE_INTERNAL_TABLE; ulong reclength, real_reclength,min_pack_length; char kfilename[FN_REFLEN],klinkname[FN_REFLEN], *klinkname_ptr; - char dfilename[FN_REFLEN],dlinkname[FN_REFLEN], *dlinkname_ptr; + char dfilename[FN_REFLEN],dlinkname[FN_REFLEN], *dlinkname_ptr= 0; ulong pack_reclength; ulonglong tot_length,max_rows, tmp; enum en_fieldtype type; |