acinclude.m4:
added macro to check if dirent.d_namlen is defined
cmd-line-utils/libedit/config.h:
added define for __attribute__
cmd-line-utils/libedit/readline.c:
checked STRUCT_DIRENT_HAS_D_NAMLEN instead of
old enumeration of problem platforms
configure.in:
added checking if dirent has d_namlen member field
discarded using of uint in cmd-line-utils/libedit/chared.c
because it's undefined on qnx
cmd-line-utils/libedit/chared.c:
discarded using of uint because it's undefined on qnx
Use 'mysqltest' as test database instead of test_$1 or test1,test2 to not accidently delete an important database
Safety fix for mailformed MERGE files
Build-tools/mysql-copyright:
Print correct file name in case of errors
Fixed indentation
include/config-win.h:
Removed unnecessary #ifdef
myisammrg/myrg_open.c:
Don't give a core if merge file contains INSERT_METHOD first (not legal but better safe than sorry)
Don't set struct variables to zero that are already zero
Indentation fixes
mysql-test/r/create.result:
Use 'mysqltest' as test database
mysql-test/r/ndb_basic.result:
Use 'mysqltest' as test database
mysql-test/r/ndb_blob.result:
Use 'mysqltest' as test database
mysql-test/r/ndb_transaction.result:
Use 'mysqltest' as test database
mysql-test/r/ps_1general.result:
Use 'mysqltest' as test database
mysql-test/r/rpl_charset.result:
Use 'mysqltest' as test database
mysql-test/r/rpl_delete_all.result:
Use 'mysqltest' as test database
mysql-test/r/show_check.result:
Use 'mysqltest' as test database
mysql-test/t/create.test:
Use 'mysqltest' as test database
mysql-test/t/ndb_basic.test:
Use 'mysqltest' as test database
mysql-test/t/ndb_blob.test:
Use 'mysqltest' as test database
mysql-test/t/ndb_transaction.test:
Use 'mysqltest' as test database
mysql-test/t/ps_1general.test:
Use 'mysqltest' as test database
mysql-test/t/rpl_charset.test:
Use 'mysqltest' as test database
mysql-test/t/rpl_delete_all.test:
Use 'mysqltest' as test database
mysql-test/t/show_check.test:
Use 'mysqltest' as test database
sql/field.h:
Mark functions that should be deleted as soon as we have a new prototype for store(longlong)
sql/lock.cc:
Indentation fix
sql/sql_base.cc:
Better comment.
Break find_item_in_list in case of perfect match
sql/sql_prepare.cc:
Simple optimization
sql/sql_select.cc:
Portability fix
functionality. The existing code takes advantage of this when
"typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
If the compiler then has prototypes for C99 functions 'strtoll()' and
'strtoull()' but no implementation, the existing code in 'strtoull.c'
collides with that prototype. These collisions are avoided now.
(backport from 4.1)
include/m_string.h:
Extend the "fake" approach from 'strtoull()' onto 'strtoll()'
(backport from 4.1).
strings/strto.c:
Ensure that calling file has included necessary headers,
as these are needed at the upper level already
(backport from 4.1).
strings/strtol.c:
Cleanup/alignment with the "long long" functions.
strings/strtoll.c:
When "long" is 64 bit already, system function 'strtol()' can be used.
Header files 'my_global.h' and 'm_string.h' will manage that,
if they are included early enough (backport from 4.1).
strings/strtoul.c:
Cleanup/alignment with the "long long" functions.
strings/strtoull.c:
When "long" is 64 bit already, system function 'strtoul()' can be used.
Header files 'my_global.h' and 'm_string.h' will manage that,
if they are included early enough (backport from 4.1).
into mysql.com:/space/pekka/ndb/version/my41-tux
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
configure.in:
Defining "BIG_TABLES" works around a problem with the Sun Forte
compiler for Solaris on x86 platforms: improper handling of "long long".
Error shows up on the "limit_rows_found" variable in test "union".
Old "BIG_FILES" was a typing error.
BitKeeper/etc/logging_ok:
auto-union
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
Removed errornous hupp, which made handler commit same transid several times
(which is checked when running in debug mode)
sql/ha_ndbcluster.cc:
Removed errornous hupp, which made handler commit same transid several times
(which is checked when running in debug mode)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
adder error insert for error during shutdown
ndb/src/kernel/error/ErrorHandlingMacros.hpp:
seeror set method for signal handler
ndb/src/kernel/main.cpp:
adder error insert for error during shutdown
ndb/src/kernel/vm/Emulator.cpp:
adder error insert for error during shutdown
+ check for error handler invoked by signal handler
ndb/src/kernel/vm/Emulator.hpp:
enum so signal that Shatdown is invoked by signal handler
with the sleep value we use for the test suite run during the
release builds
BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
Delete: mysql-test/t/flush_block_commit-master.opt
sql/item_cmpfunc.cc:
NOT elimination moved in parsing (we do not need fix fields in it and PS processing)
sql/item_cmpfunc.h:
NOT elimination moved in parsing (we do not need fix fields in it and PS processing)
sql/sql_select.cc:
NOT elimination moved in parsing (we do not need fix fields in it and PS processing)
sql/sql_yacc.yy:
NOT elimination moved in parsing
We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.
sql/log.cc:
When SET CHARACTER SET has been used, we must reset the charset after the writing the statement, in the binlog.
In 4.1, this resetting is already achieved by the SET ONE_SHOT syntax.
sql/log_event.cc:
In slave, we must not simply reset the charset after each statement: if we do this, the charset gets
immediately after executing the SET CHARACTER SET! (BUG#4500).
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
mysql-test/r/lowercase_table.result:
Changed foo database -> mysqltest
More test cases
mysql-test/t/lowercase_table.test:
Changed foo database -> mysqltest
More test cases
mysys/my_getopt.c:
Fix new code to use MySQL indentation style
sql/log.cc:
Change to use MySQL indentation style and naming conventions
Remove usage of strlen() and strcat()
sql/mysqld.cc:
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()
sql/sql_base.cc:
Added comment
sql/table.cc:
Added #if MYSQL_VERSION_ID < 40100 to ensure code is merged correctly