Skip to content

Commit 2dc3cfe

Browse files
author
Davi Arnaut
committed
Merge of mysql-trunk-bugfixing into mysql-next-mr-bugfixing.
2 parents f3891a0 + 152df97 commit 2dc3cfe

File tree

146 files changed

+285
-4919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+285
-4919
lines changed

‎client/mysql.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -627,10 +627,6 @@ static COMMANDS commands[] = {
627627
{ "QUARTER", 0, 0, 0, ""},
628628
{ "QUERY", 0, 0, 0, ""},
629629
{ "QUICK", 0, 0, 0, ""},
630-
{ "RAID0", 0, 0, 0, ""},
631-
{ "RAID_CHUNKS", 0, 0, 0, ""},
632-
{ "RAID_CHUNKSIZE", 0, 0, 0, ""},
633-
{ "RAID_TYPE", 0, 0, 0, ""},
634630
{ "READ", 0, 0, 0, ""},
635631
{ "READS", 0, 0, 0, ""},
636632
{ "REAL", 0, 0, 0, ""},

‎client/mysqltest.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8517,7 +8517,7 @@ void free_replace_column()
85178517
typedef struct st_pointer_array { /* when using array-strings */
85188518
TYPELIB typelib; /* Pointer to strings */
85198519
uchar *str; /* Strings is here */
8520-
int7 *flag; /* Flag about each var. */
8520+
uint8 *flag; /* Flag about each var. */
85218521
uint array_allocs,max_count,length,max_length;
85228522
} POINTER_ARRAY;
85238523

@@ -9648,7 +9648,7 @@ int insert_pointer_name(reg1 POINTER_ARRAY *pa,char * name)
96489648
}
96499649
pa->max_count=(PC_MALLOC-MALLOC_OVERHEAD)/(sizeof(uchar*)+
96509650
sizeof(*pa->flag));
9651-
pa->flag= (int7*) (pa->typelib.type_names+pa->max_count);
9651+
pa->flag= (uint8*) (pa->typelib.type_names+pa->max_count);
96529652
pa->length=0;
96539653
pa->max_length=PS_MALLOC-MALLOC_OVERHEAD;
96549654
pa->array_allocs=1;
@@ -9684,7 +9684,7 @@ int insert_pointer_name(reg1 POINTER_ARRAY *pa,char * name)
96849684
pa->typelib.type_names=new_array;
96859685
old_count=pa->max_count;
96869686
pa->max_count=len/(sizeof(uchar*) + sizeof(*pa->flag));
9687-
pa->flag= (int7*) (pa->typelib.type_names+pa->max_count);
9687+
pa->flag= (uint8*) (pa->typelib.type_names+pa->max_count);
96889688
memcpy((uchar*) pa->flag,(char *) (pa->typelib.type_names+old_count),
96899689
old_count*sizeof(*pa->flag));
96909690
}

‎config/ac-macros/character_sets.m4‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ dnl you must also create strings/ctype-$charset_name.c
55

66
AC_DIVERT_PUSH(0)
77

8-
# Any changes to the available character sets must also go into
9-
# include/config-win.h
10-
118
define(CHARSETS_AVAILABLE0,binary)
129
define(CHARSETS_AVAILABLE1,armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257)
1310
define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 eucjpms euckr gb2312 gbk geostd8)

‎configure.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,6 @@ case $SYSTEM_TYPE in
12121212
# Fixes for HPUX 11.0 compiler
12131213
if test "$ac_cv_prog_gcc" = "no"
12141214
then
1215-
CFLAGS="$CFLAGS -DHAVE_BROKEN_INLINE"
12161215
# set working flags first in line, letting override it (i. e. for debug):
12171216
CXXFLAGS="+O2 $CXXFLAGS"
12181217
MAX_C_OPTIMIZE=""
@@ -1999,6 +1998,9 @@ fi
19991998
dnl Checks for typedefs, structures, and compiler characteristics.
20001999
AC_C_CONST
20012000
AC_C_INLINE
2001+
AS_IF([test "x$ac_cv_c_inline" = "xno"],
2002+
[AC_MSG_WARN([The C compiler does not support inline. Beware that unused
2003+
functions might not be eliminated the object files.])])
20022004
AC_TYPE_OFF_T
20032005
AC_STRUCT_ST_RDEV
20042006
AC_HEADER_TIME

‎extra/replace.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
fill_buffer_retaining() is taken from gnu-grep and modified.
4040
*/
4141

42-
#define DONT_USE_RAID
4342
#include <my_global.h>
4443
#include <m_ctype.h>
4544
#include <my_sys.h>
@@ -52,7 +51,7 @@
5251
typedef struct st_pointer_array { /* when using array-strings */
5352
TYPELIB typelib; /* Pointer to strings */
5453
uchar *str; /* Strings is here */
55-
int7 *flag; /* Flag about each var. */
54+
uint8 *flag; /* Flag about each var. */
5655
uint array_allocs,max_count,length,max_length;
5756
} POINTER_ARRAY;
5857

@@ -267,7 +266,7 @@ static int insert_pointer_name(reg1 POINTER_ARRAY *pa,char * name)
267266
}
268267
pa->max_count=(PC_MALLOC-MALLOC_OVERHEAD)/(sizeof(uchar*)+
269268
sizeof(*pa->flag));
270-
pa->flag= (int7*) (pa->typelib.type_names+pa->max_count);
269+
pa->flag= (uint8*) (pa->typelib.type_names+pa->max_count);
271270
pa->length=0;
272271
pa->max_length=PS_MALLOC-MALLOC_OVERHEAD;
273272
pa->array_allocs=1;
@@ -304,7 +303,7 @@ static int insert_pointer_name(reg1 POINTER_ARRAY *pa,char * name)
304303
pa->typelib.type_names=new_array;
305304
old_count=pa->max_count;
306305
pa->max_count=len/(sizeof(uchar*) + sizeof(*pa->flag));
307-
pa->flag= (int7*) (pa->typelib.type_names+pa->max_count);
306+
pa->flag= (uint8*) (pa->typelib.type_names+pa->max_count);
308307
memcpy((uchar*) pa->flag,(char *) (pa->typelib.type_names+old_count),
309308
old_count*sizeof(*pa->flag));
310309
}

‎extra/resolve_stack_dump.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
versions into symbolic names. By Sasha Pachev <[email protected]>
1818
*/
1919

20-
#define DONT_USE_RAID
2120
#include <my_global.h>
2221
#include <m_ctype.h>
2322
#include <my_sys.h>

‎include/Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
3333
m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
3434
$(HEADERS_GEN_MAKE) probes_mysql.h probes_mysql_nodtrace.h
3535

36-
noinst_HEADERS = config-win.h lf.h my_bit.h \
36+
noinst_HEADERS = lf.h my_bit.h \
3737
heap.h my_bitmap.h my_uctype.h password.h \
3838
myisam.h myisampack.h myisammrg.h ft_global.h\
3939
mysys_err.h my_base.h \
4040
my_nosys.h my_alarm.h queues.h rijndael.h sha1.h sha2.h \
41-
my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
41+
my_aes.h my_tree.h hash.h thr_alarm.h \
4242
thr_lock.h t_ctype.h violite.h my_md5.h base64.h \
4343
my_handler.h my_time.h service_versions.h \
4444
my_rdtsc.h mysql/psi/psi_abi_v1.h mysql/psi/psi_abi_v2.h \
45-
my_vle.h my_user.h my_atomic.h atomic/nolock.h \
45+
my_user.h my_atomic.h atomic/nolock.h \
4646
atomic/rwlock.h atomic/x86-gcc.h atomic/generic-msvc.h \
4747
atomic/gcc_builtins.h my_libwrap.h my_stacktrace.h \
4848
atomic/solaris.h mysql/innodb_priv.h my_compiler.h

0 commit comments

Comments
 (0)