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().
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
include/my_sys.h:
Changed function name.
include/mysql_com.h:
New function, modify_defaults_file()
libmysql/Makefile.shared:
New file, default_modify.lo
libmysql/libmysql.def:
New function, modify_defaults_file() and fixed version number.
libmysqld/libmysqld.def:
New function, modify_defaults_file()
mysys/Makefile.am:
New file, default_modify.c
mysys/default.c:
Removed function from default.c. New, corresponding one is in default_modify.c,
name is modify_defaults_file.
server-tools/instance-manager/commands.cc:
Changed function name.
sql/mysqld.cc:
Fixed typo.
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling
config/ac-macros/misc.m4:
Remove warnings flags from icc when compiling with -Werror
configure.in:
Remove warnings flags from icc when compiling with -Werror
extra/replace.c:
Fix warnings from icc
include/my_dbug.h:
Fix warnings from icc
sql/gen_lex_hash.cc:
Fix warnings from icc
sql/mysql_priv.h:
Add missing variables
sql/mysqld.cc:
Fix warnings from icc:
- made a lot of variables static
- Removing some not used variables
- Fixed wrong printf()
- removed extern "C" from some functions
sql/spatial.h:
Fix warnings from icc
sql/sql_acl.cc:
Fixed memory leak
sql/sql_lex.cc:
Fix warnings from icc
sql/sql_lex.h:
Fix warnings from icc
Add YASSL to Windows source distribution
Skip .deps, and remove .o files from source dist
scripts/make_win_src_distribution.sh:
Add YASSL to Windows source distribution
Skip .deps, and remove .o files from source dist
BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
Delete: mysql-test/t/grant_cache-master.opt
mysql-test/r/grant_cache.result:
query cache management moved inside test
mysql-test/t/grant_cache.test:
query cache management moved inside test to privent server reloading during test
Added test cases for bug #7914.
sql_select.cc:
Fixed bug #7914: rollup over expresssions such as sum(a)+1.
sql/sql_select.cc:
Fixed bug #7914: rollup over expresssions such as sum(a)+1.
mysql-test/t/olap.test:
Added test cases for bug #7914.
mysql-test/r/olap.result:
Added test cases for bug #7914.
Fix build scripts to create them.
BitKeeper/deleted/.del-config.guess~fd94a91a69a8ce8:
Delete: config.guess
BitKeeper/deleted/.del-config.sub~d18f703b655db258:
Delete: config.sub
BitKeeper/deleted/.del-depcomp~d5c35239e36674f1:
Delete: depcomp
BitKeeper/deleted/.del-install-sh~ddc86c88a9bebd00:
Delete: install-sh
BitKeeper/deleted/.del-ltconfig~6d12dc759ce40830:
Delete: ltconfig
BitKeeper/deleted/.del-ltmain.sh~9b8b907df176f96e:
Delete: ltmain.sh
BitKeeper/deleted/.del-missing~3fe9ea908d3a7caa:
Delete: missing
BitKeeper/deleted/.del-mkinstalldirs~fa914ace602e1447:
Delete: mkinstalldirs
BUILD/FINISH.sh:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-ccc:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-cxx:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-debug:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-hpux11-parisc2-aCC:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-ia64-debug-max:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-irix-mips64-mipspro:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-pentium-pgcc:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-debug:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-forte:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-purify:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc:
Move autotools bootstrap scripts invocation to one place (autorun.sh)
BitKeeper/etc/ignore:
Added config.guess config.sub install-sh ltmain.sh missing to the ignore list
to easily check the storage engine supports DELAYED).
client/mysqldump.c:
disabling --delayed-insert until BUG#7815 is fixed (need table def cae)
mysql-test/r/mysqldump.result:
as we disable --delayed-insert, result changes
To be safe, put "..." around variables to the test command
scripts/make_binary_distribution.sh:
To be safe, put "..." around variables to the test command
Prefix enum symbols LOG_* with IM_, not to clash with system headers
server-tools/instance-manager/instance_options.cc:
Prefix enum symbols LOG_* with IM_, not to clash with system headers
server-tools/instance-manager/parse.cc:
Prefix enum symbols LOG_* with IM_, not to clash with system headers
server-tools/instance-manager/parse.h:
Prefix enum symbols LOG_* with IM_, not to clash with system headers
server-tools/instance-manager/commands.cc:
Prefix enum symbols LOG_* with IM_, not to clash with system headers
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
Removed unused variable 'field' from print_warnings()
libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
Added "my_chsize.c"
VC++Files/client/mysqlclient.dsp:
Added "my_chsize.c"
VC++Files/libmysql/libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
client/mysql.cc:
Removed unused variable 'field' from print_warnings()
mysys/default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
