Merge mysql-5.1 -> mysql-5.5
I manually checked that all the conflicting InnoDB changes are in 5.5 already. Two things I am not sure about - I commented them with XXX in this patch. I will further check with the authors of the changesets whether these things should be present or not.
This commit is contained in:
commit
b8ca26691d
@ -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>
|
||||
|
@ -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)
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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(
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user