into trift2.:/M50/merge-4.1-to-5.0
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/libmysqld/libmysqld_ia64.dsp:
Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
VC++Files/sql/mysqld_ia64.dsp:
Auto merged
VC++Files/sql/mysqldmax.dsp:
Auto merged
sql/field.cc:
Merge a backport == Null-merge == "ul".
sql/field.h:
Merge a backport == Null-merge == "ul".
sql/sql_locale.cc:
Changes were already present (and even better) == Null-merge == "ul".
1) When initializing a boolean variable, do not use string representations '"false"' and '"true"'
but rather the boolean values 'false' and 'true'.
2) Add the module to the various Windows description files.
VC++Files/libmysqld/libmysqld.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/libmysqld/libmysqld.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/libmysqld/libmysqld_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqldmax.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqldmax_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
sql/sql_locale.cc:
When initializing a boolean variable, do not use stringrepresentations '"false"' and '"true"'
but rather the boolean values 'false' and 'true'.
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
