Commit 4d891eb9 authored by unknown's avatar unknown
Browse files

WL1034 update for latest 5.1 sources 


BUILD/SETUP.sh:
  for now no optimizations in debug build - get rid of "value optimized out"
parent dad8c665

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ fast_cflags="-O3 -fno-omit-frame-pointer" 
reckless_cflags="-O3 -fomit-frame-pointer "



debug_cflags="-DUNIV_MUST_NOT_INLINE -DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DPEDANTIC_SAFEMALLOC -DSAFE_MUTEX"

debug_extra_cflags="-O1 -Wuninitialized"

debug_extra_cflags="-O0"



base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

amd64_cxxflags=""				# If dropping '--with-big-tables', add here  "-DBIG_TABLES"

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -751,6 +751,7 @@ extern void get_dynamic(DYNAMIC_ARRAY *array,gptr element,uint array_index); 
extern void delete_dynamic(DYNAMIC_ARRAY *array);

extern void delete_dynamic_element(DYNAMIC_ARRAY *array, uint array_index);

extern void freeze_size(DYNAMIC_ARRAY *array);

extern int  get_index_dynamic(DYNAMIC_ARRAY *array, gptr element);

#define dynamic_array_ptr(array,array_index) ((array)->buffer+(array_index)*(array)->size_of_element)

#define dynamic_element(array,array_index,type) ((type)((array)->buffer) +(array_index))

#define push_dynamic(A,B) insert_dynamic(A,B)

libmysqld/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \

	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \

	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc event.cc \

        rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc 



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

mysys/array.c

+25 −0
Original line number Diff line number Diff line
@@ -278,3 +278,28 @@ void freeze_size(DYNAMIC_ARRAY *array) 
    array->max_element=elements;

  }

}





/*

  Get the index of a dynamic element



  SYNOPSIS

    get_index_dynamic()

     array	Array

     element Whose element index 



*/



int get_index_dynamic(DYNAMIC_ARRAY *array, gptr element)

{

  uint ret;

  if (array->buffer > element)

    return -1;



  ret= (element - array->buffer) /  array->size_of_element;

  if (ret > array->elements)

    return -1;



  return ret;



}

sql/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
                        tztime.h my_decimal.h\

			sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \

			parse_file.h sql_view.h	sql_trigger.h \

			sql_array.h sql_cursor.h \

			sql_array.h sql_cursor.h event.h \

			sql_plugin.h authors.h

mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \

			item.cc item_sum.cc item_buff.cc item_func.cc \
@@ -94,7 +94,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			gstream.cc spatial.cc sql_help.cc sql_cursor.cc \

                        tztime.cc my_time.c my_decimal.cc\

			sp_head.cc sp_pcontext.cc  sp_rcontext.cc sp.cc \

			sp_cache.cc parse_file.cc sql_trigger.cc \

			sp_cache.cc parse_file.cc sql_trigger.cc event.cc \

			sql_plugin.cc\

			handlerton.cc

EXTRA_mysqld_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \