Use MY_STAT to declare argument to my_fstat()
des_key_file.cc:
Use local seach path for "mysql_priv.h"
mysys.dsp, libmysqld.dsp, libmysql.dsp:
New file needed, "../mysys/default_modify.c"
VC++Files/libmysql/libmysql.dsp:
New file needed, "../mysys/default_modify.c"
VC++Files/libmysqld/libmysqld.dsp:
New file needed, "../mysys/default_modify.c"
VC++Files/mysys/mysys.dsp:
New file needed, "../mysys/default_modify.c"
sql/des_key_file.cc:
Use local seach path for "mysql_priv.h"
mysys/default_modify.c:
Use MY_STAT to declare argument to my_fstat()
extra/yassl/include/yassl_types.hpp:
A fix for Sun Forte 7
extra/yassl/mySTL/helpers.hpp:
Better comment for the previous fix.
extra/yassl/mySTL/list.hpp:
A fix for Sun Forte 7
extra/yassl/include/openssl/ssl.h:
Fix -std=c++98 mode compilation failures.
extra/yassl/include/yassl_error.hpp:
Fix -std=c++98 mode compilation failures.
extra/yassl/include/yassl_types.hpp:
Fix -std=c++98 mode compilation failures.
extra/yassl/mySTL/helpers.hpp:
Fix AIX 5.2 compilation problem.
extra/yassl/taocrypt/include/asn.hpp:
Fix -std=c++98 mode compilation failures.
vio/Makefile.am:
Add a dummy C++ file to SSL tests to make libtool use a C++ linker:
this lets ssl tests link when using yaSSL and a non-gcc C++ compiler.
Portability fixes
extra/yassl/include/buffer.hpp:
Use assert.h instead of less portable cassert
extra/yassl/include/log.hpp:
Use stdio.h instead of less portable cstdio
extra/yassl/include/socket_wrapper.hpp:
Use assert.h instead of less portable cassert
extra/yassl/mySTL/helpers.hpp:
Use stdlib.h instead of less portable cstdlib
extra/yassl/mySTL/stdexcept.hpp:
Use string.h instead of less portable cstring
extra/yassl/mySTL/vector.hpp:
Use assert.h instead of less portable cassert
extra/yassl/src/ssl.cpp:
Use stdio.h instead of less portable cstdio
extra/yassl/taocrypt/include/block.hpp:
Use stddef.h instead of less portable cstddef, always use ptrdiff_t instead of less portable std::ptrdiff_t
extra/yassl/taocrypt/include/file.hpp:
Use stdio.h instead of less portable cstdio
extra/yassl/taocrypt/include/integer.hpp:
Use string.h instead of less portable cstring
extra/yassl/taocrypt/include/runtime.hpp:
Use stdlib.h instead of less portable cstdlib
extra/yassl/taocrypt/src/dh.cpp:
Use math.h instead of less portable cmatch
Fixes for valgrind errors and compatiblity issues by Monty
myisam/rt_split.c:
Fixes for valgrind errors and compatiblity issues by Monty
sql/field_conv.cc:
Fixes for valgrind errors and compatiblity issues by Monty
sql/sql_delete.cc:
Fixes for valgrind errors and compatiblity issues by Monty
sql/sql_select.cc:
Fixes for valgrind errors and compatiblity issues by Monty
strings/my_vsnprintf.c:
Fixes for valgrind errors and compatiblity issues by Monty
we need proper rounding there
mysql-test/r/func_math.result:
test result fixed
mysql-test/t/func_math.test:
test case added
sql/item_func.cc:
my_double_round implementation added
sql/item_strfunc.cc:
my_double_round used
sql/mysql_priv.h:
my_double_round interface
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
sql/item_func.cc:
Auto merged
- after review fixes
mysql-test/r/ndb_basic.result:
Test using table with long name
mysql-test/t/ndb_basic.test:
Test using table with long name
ndb/include/transporter/TransporterDefinitions.hpp:
Define constant for max section size
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add check for not sending too long table name to ndb kernel
sql/spatial.cc:
just float8get doesn't work well with the local variables -
they can be of processor-specific floating type - not the
standard decimal (by hf)
sql/item_func.cc:
a fix (bug #10599: Numeric function 'abs' make server crash).
Item_func_abs::decimal_op() now returns 0 if NULL.
trivial optimization - get rid of an extra jump for common situations.
fixed Item_func_neg::decimal_op() return value if NULL.
This fixes a compilation failure in mysql_com.h, which doesn't have
'uint' alias visibile. Maybe worth while changing to unsigned int, but
the rest of functions that work with defaults files return int.
include/my_sys.h:
Change the return type back to int (modify_defaults_file).
include/mysql_com.h:
Change the return type back to int (modify_defaults_file).
mysys/default_modify.c:
Change the return type back to int (modify_defaults_file).
sql/item_func.cc:
a fix (bug #10599: Numeric function 'abs' make server crash).
Item_func_abs::decimal_op() and Item_func_neg::decimal_op()
now return 0 if NULL.
Trivial optimization - get rid of an extra jump for common situations.
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/handler.h:
Resolve merge
sql/table.cc:
Resolve merge
ndb/include/kernel/ndb_limits.h:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysys/thr_alarm.c:
Manual merge
- Fix valgrind warnings
- Remove static db, schema and table name buffers from Ndb.cpp
mysys/thr_alarm.c:
Initialise sact to zero
ndb/include/kernel/ndb_limits.h:
Set MAX_ATTR_NAME_SIZE to NAME_LEN which is tha maximum in MySQL
ndb/include/kernel/signaldata/GetTabInfo.hpp:
Clean up
ndb/include/ndbapi/Ndb.hpp:
Remove NDB_MAX_INTERNAL_NAME_LENGTH and all char buffers for schema, db and tablename.
Made them dynamic and moved to NdbImpl.hpp
ndb/include/ndbapi/ndbapi_limits.h:
Remove the static length's of attr, db, schema and table name.
ndb/src/common/transporter/Packer.cpp:
Set theSignalId to ~0 when unpacking signal
ndb/src/ndbapi/Ndb.cpp:
Moved schema, database and tablename to NdbImpl.hpp
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add NdbIndexImpl::init and NdbEventImpl::init
Init all vars in NdbIndexImpl, NdbEventImpl, NdbTableImpl and NdbIndexImpl
Delete the pseudo column NDB$RANGE_NO
Copy tablename to internal buff in NdbDictInterface to get proper alignment.
Convert length of table name from bytes words, when setting sz of LinearSectionPtr
Set LinearSectionPtr array size to number of LinearSections used - save some stack.
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Add NdbEventImpl::init and NdbIndexImpl::init
Remove clearNewProperties and copyNewProperties, it's easier to check if all vars are initied if it's done in the same func.
Add buffer for tabname ti NdbDictInterface, memset it to 0 in initializer.
ndb/src/ndbapi/NdbImpl.hpp:
Use BaseString for table, schema and db names.
ndb/src/ndbapi/Ndbinit.cpp:
Move schema and db name to NdbImpl and use BaseString
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Destroy ndb_global_event_buffer_mutex and ndb_print_state_mutex
sql/ha_ndbcluster.cc:
Check if pTrans is not null before calling closeTransaction
Remove NDB_MAX_ATTR_NAME_SIZE
Remove truncation of attr names. When attr name length is same in NDB as in MySQL this will be checked in functin check_column_name
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
mysql-test/r/merge.result:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
The test result.
mysql-test/t/merge.test:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
The test case does not in all cases show the problem
without the bugfix. The improper memory allocation
might get through undetected in many cases.
sql/ha_myisammrg.h:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
Set a table_flag for the MERGE engine telling that any index
might be unique without being specified as such.
sql/handler.h:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
Added a new table_flag telling that any index
might be unique without being specified as such.
sql/sql_insert.cc:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
Changed the freeing of the memory to be symmetric to its
allocation (my_safe_alloc -> my_safe_afree).
This is not directly related to the bug.
sql/table.cc:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
