diff options
| author | unknown <jimw@mysql.com> | 2005-06-24 13:41:33 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-06-24 13:41:33 -0700 |
| commit | 61be166c94670005bb90edf3c7153e0a9b1a7c2e (patch) | |
| tree | f29e416cf6a91425d2edb7c5e7cca1dde42543f6 /VC++Files/strings | |
| parent | ea00bdee42c396b7e8c0fc08439774c138dc7655 (diff) | |
| download | mariadb-git-61be166c94670005bb90edf3c7153e0a9b1a7c2e.tar.gz | |
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
Diffstat (limited to 'VC++Files/strings')
| -rw-r--r-- | VC++Files/strings/backup/strings.dsp | 7 | ||||
| -rw-r--r-- | VC++Files/strings/noMASM/strings.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/strings/strings.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/strings/strings_ia64.dsp | 4 |
4 files changed, 18 insertions, 1 deletions
diff --git a/VC++Files/strings/backup/strings.dsp b/VC++Files/strings/backup/strings.dsp index a6be39b40ab..dcff9915f13 100644 --- a/VC++Files/strings/backup/strings.dsp +++ b/VC++Files/strings/backup/strings.dsp @@ -238,7 +238,12 @@ InputName=Strxmov # End Source File # Begin Source File -SOURCE=.\strxnmov.c +SOURCE=.\strxnmov.c +# End Source File +# Begin Source File + +SOURCE=.\str_alloc.c # End Source File + # End Target # End Project diff --git a/VC++Files/strings/noMASM/strings.dsp b/VC++Files/strings/noMASM/strings.dsp index ffec20f3a59..e7a0395c3df 100644 --- a/VC++Files/strings/noMASM/strings.dsp +++ b/VC++Files/strings/noMASM/strings.dsp @@ -256,6 +256,10 @@ SOURCE=.\strxnmov.c # End Source File # Begin Source File +SOURCE=.\str_alloc.c +# End Source File +# Begin Source File + SOURCE=.\xml.c # End Source File # End Target diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp index 320cdaf2132..714359c5570 100644 --- a/VC++Files/strings/strings.dsp +++ b/VC++Files/strings/strings.dsp @@ -273,6 +273,10 @@ SOURCE=.\strxnmov.c # End Source File # Begin Source File +SOURCE=.\str_alloc.c +# End Source File +# Begin Source File + SOURCE=.\xml.c # End Source File # End Target diff --git a/VC++Files/strings/strings_ia64.dsp b/VC++Files/strings/strings_ia64.dsp index c0b7b9c292c..0ccb4f62928 100644 --- a/VC++Files/strings/strings_ia64.dsp +++ b/VC++Files/strings/strings_ia64.dsp @@ -272,6 +272,10 @@ SOURCE=.\strxnmov.c # End Source File # Begin Source File +SOURCE=.\str_alloc.c +# End Source File +# Begin Source File + SOURCE=.\xml.c # End Source File # End Target |