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

Merge mysql-5.1 -> mysql-5.5

Browse Source 
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:
Vasil Dimov 2011-11-18 13:57:10 +02:00
commit b8ca26691d
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd-line-utils/libedit/histedit.h
View File

@ -43,7 +43,12 @@
#define LIBEDIT_MAJOR 2 #define LIBEDIT_MAJOR 2
#define LIBEDIT_MINOR 11 #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> #include <stdint.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>

15
cmd-line-utils/libedit/np/unvis.c
View File

@ -47,14 +47,21 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93";
#include <assert.h> #include <assert.h>
#include <ctype.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> #include <stdint.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_VIS_H /*
#include <vis.h> XXXMYSQL : Due to different versions of vis.h available,
#else use the one bundled with libedit.
*/
#include "np/vis.h" #include "np/vis.h"
#endif
#ifdef __weak_alias #ifdef __weak_alias
__weak_alias(strnunvisx,_strnunvisx) __weak_alias(strnunvisx,_strnunvisx)

8
cmd-line-utils/libedit/np/vis.c
View File

@ -68,11 +68,11 @@
#include <sys/types.h> #include <sys/types.h>
#include <assert.h> #include <assert.h>
#ifdef HAVE_VIS_H /*
#include <vis.h> XXXMYSQL : Due to different versions of vis.h available,
#else use the one bundled with libedit.
*/
#include "np/vis.h" #include "np/vis.h"
#endif
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>

2
cmd-line-utils/libedit/read.c
View File

@ -333,7 +333,7 @@ memset(&state, 0, sizeof(mbstate_t));
#ifdef WIDECHAR #ifdef WIDECHAR
++cbp; ++cbp;
if (cbp > MB_CUR_MAX) { /* "shouldn't happen" */ if (cbp > (size_t) MB_CUR_MAX) { /* "shouldn't happen" */
*cp = '\0'; *cp = '\0';
return (-1); return (-1);
} }

3
storage/innobase/handler/ha_innodb.cc
View File

@ -5261,6 +5261,9 @@ calc_row_difference(
dfield_set_null(&ufield->new_val); dfield_set_null(&ufield->new_val);
} }
/* XXX merge issues, should this be here?
ufield->extern_storage = FALSE;
*/
ufield->exp = NULL; ufield->exp = NULL;
ufield->orig_len = 0; ufield->orig_len = 0;
ufield->field_no = dict_col_get_clust_pos( ufield->field_no = dict_col_get_clust_pos(

2
storage/innobase/row/row0ins.c
View File

@ -276,7 +276,9 @@ row_ins_sec_index_entry_by_modify(
err = btr_cur_pessimistic_update(BTR_KEEP_SYS_FLAG, cursor, err = btr_cur_pessimistic_update(BTR_KEEP_SYS_FLAG, cursor,
&heap, &dummy_big_rec, update, &heap, &dummy_big_rec, update,
0, thr, mtr); 0, thr, mtr);
/* XXX merge conflicts, should this be here?
ut_ad(!dummy_big_rec); ut_ad(!dummy_big_rec);
*/
} }
func_exit: func_exit:
mem_heap_free(heap); mem_heap_free(heap);