diff options
| -rw-r--r-- | cmd-line-utils/libedit/histedit.h | 5 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/unvis.c | 15 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/vis.c | 8 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/read.c | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/row/row0ins.c | 2 |
6 files changed, 26 insertions, 9 deletions
diff --git a/cmd-line-utils/libedit/histedit.h b/cmd-line-utils/libedit/histedit.h index 9f2b245f851..523d27b0be2 100644 --- a/cmd-line-utils/libedit/histedit.h +++ b/cmd-line-utils/libedit/histedit.h @@ -43,7 +43,12 @@ #define LIBEDIT_MAJOR 2 #define LIBEDIT_MINOR 11 +/* XXXMYSQL : stdint.h might not be available on older Solaris platforms. */ +#if defined(__sun) || defined(__sun__) +#include <sys/inttypes.h> +#else #include <stdint.h> +#endif #include <sys/types.h> #include <stdio.h> diff --git a/cmd-line-utils/libedit/np/unvis.c b/cmd-line-utils/libedit/np/unvis.c index 4c523608c27..812d280b2d8 100644 --- a/cmd-line-utils/libedit/np/unvis.c +++ b/cmd-line-utils/libedit/np/unvis.c @@ -47,14 +47,21 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #include <assert.h> #include <ctype.h> + +/* XXXMYSQL : stdint.h might not be available on older Solaris platforms. */ +#if defined(__sun) || defined(__sun__) +#include <sys/inttypes.h> +#else #include <stdint.h> +#endif + #include <stdio.h> #include <errno.h> -#ifdef HAVE_VIS_H -#include <vis.h> -#else +/* + XXXMYSQL : Due to different versions of vis.h available, + use the one bundled with libedit. +*/ #include "np/vis.h" -#endif #ifdef __weak_alias __weak_alias(strnunvisx,_strnunvisx) diff --git a/cmd-line-utils/libedit/np/vis.c b/cmd-line-utils/libedit/np/vis.c index 6c75438c352..d7cc37b4f47 100644 --- a/cmd-line-utils/libedit/np/vis.c +++ b/cmd-line-utils/libedit/np/vis.c @@ -68,11 +68,11 @@ #include <sys/types.h> #include <assert.h> -#ifdef HAVE_VIS_H -#include <vis.h> -#else +/* + XXXMYSQL : Due to different versions of vis.h available, + use the one bundled with libedit. +*/ #include "np/vis.h" -#endif #include <errno.h> #include <stdlib.h> diff --git a/cmd-line-utils/libedit/read.c b/cmd-line-utils/libedit/read.c index 48bf4efd59b..a919b888965 100644 --- a/cmd-line-utils/libedit/read.c +++ b/cmd-line-utils/libedit/read.c @@ -333,7 +333,7 @@ memset(&state, 0, sizeof(mbstate_t)); #ifdef WIDECHAR ++cbp; - if (cbp > MB_CUR_MAX) { /* "shouldn't happen" */ + if (cbp > (size_t) MB_CUR_MAX) { /* "shouldn't happen" */ *cp = '\0'; return (-1); } diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 4e01f7e1cf4..16cb61fd22e 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -5261,6 +5261,9 @@ calc_row_difference( dfield_set_null(&ufield->new_val); } + /* XXX merge issues, should this be here? + ufield->extern_storage = FALSE; + */ ufield->exp = NULL; ufield->orig_len = 0; ufield->field_no = dict_col_get_clust_pos( diff --git a/storage/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c index 6e311ce2e80..fc1ff694e32 100644 --- a/storage/innobase/row/row0ins.c +++ b/storage/innobase/row/row0ins.c @@ -276,7 +276,9 @@ row_ins_sec_index_entry_by_modify( err = btr_cur_pessimistic_update(BTR_KEEP_SYS_FLAG, cursor, &heap, &dummy_big_rec, update, 0, thr, mtr); + /* XXX merge conflicts, should this be here? ut_ad(!dummy_big_rec); + */ } func_exit: mem_heap_free(heap); |