Commit f56dd2a0 authored by unknown's avatar unknown
Browse files

Add my_str_malloc and _free function pointers to strings library 

which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003)


strings/conf_to_src.c:
  if malloc() fails, just abort
VC++Files/client/mysqlclient.dsp:
  Add str_alloc.c
VC++Files/client/mysqlclient_ia64.dsp:
  Add str_alloc.c
VC++Files/libmysql/libmysql.dsp:
  Add str_alloc.c
VC++Files/libmysql/libmysql_ia64.dsp:
  Add str_alloc.c
VC++Files/libmysqld/libmysqld.dsp:
  Add str_alloc.c
VC++Files/libmysqld/libmysqld_ia64.dsp:
  Add str_alloc.c
VC++Files/strings/backup/strings.dsp:
  Add str_alloc.c
VC++Files/strings/noMASM/strings.dsp:
  Add str_alloc.c
VC++Files/strings/strings.dsp:
  Add str_alloc.c
VC++Files/strings/strings_ia64.dsp:
  Add str_alloc.c
include/m_string.h:
  Add my_str_malloc/free function pointers.
libmysql/Makefile.shared:
  Add str_alloc.lo
sql/mysqld.cc:
  Reassign my_str_malloc/free pointers so they use my_malloc/free
strings/Makefile.am:
  Add str_alloc.c
strings/ctype-tis620.c:
  Use my_str_malloc/free
parent d34e2ccb

VC++Files/client/mysqlclient.dsp

+4 −0
Original line number Diff line number Diff line
@@ -571,6 +571,10 @@ SOURCE=..\strings\strxnmov.c 
# End Source File

# Begin Source File



SOURCE=..\strings\str_alloc.c

# End Source File

# Begin Source File



SOURCE=..\mysys\thr_mutex.c

# End Source File

# Begin Source File

VC++Files/client/mysqlclient_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -552,6 +552,10 @@ SOURCE=..\strings\strxnmov.c 
# End Source File

# Begin Source File



SOURCE=..\strings\str_alloc.c

# End Source File

# Begin Source File



SOURCE=..\mysys\thr_mutex.c

# End Source File

# Begin Source File

VC++Files/libmysql/libmysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -539,6 +539,10 @@ SOURCE=..\strings\strxnmov.c 
# End Source File

# Begin Source File



SOURCE=..\strings\str_alloc.c

# End Source File

# Begin Source File



SOURCE=..\mysys\thr_mutex.c

# End Source File

# Begin Source File

VC++Files/libmysql/libmysql_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -526,6 +526,10 @@ SOURCE=..\strings\strxnmov.c 
# End Source File

# Begin Source File



SOURCE=..\strings\str_alloc.c

# End Source File

# Begin Source File



SOURCE=..\mysys\thr_mutex.c

# End Source File

# Begin Source File

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -600,6 +600,10 @@ SOURCE=..\strings\strxnmov.c 
# End Source File

# Begin Source File



SOURCE=..\strings\str_alloc.c

# End Source File

# Begin Source File



SOURCE=..\sql\table.cpp

# End Source File

# Begin Source File