into mysql.com:/home/jwinstead2/mysql-5.0-clean
libmysql_r/Makefile.am:
Auto merged
mysql-test/r/analyse.result:
Auto merged
sql/sql_analyse.cc:
Auto merged
mysql-test/r/func_sapdb.result:
Added test for bug #7586 "TIMEDIFF for sec+microsec not working
properly". Corrected previously wrong results of couple other
statements.
mysql-test/t/func_sapdb.test:
Added test for bug #7586 "TIMEDIFF for sec+microsec not working
properly".
sql/item_timefunc.cc:
Item_func_timediff::val_str():
Use simplier and less error-prone implementation. Now we are counting
difference between time values in microseconds and convert it to time
value (instead of using seconds and taking difference in "second_part"s
into account).
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/opt_range.cc:
Auto merged
config/ac-macros/character_sets.m4:
added cp932, eucjp_ms character set
include/m_ctype.h:
added cp932, eucjp_ms character set
libmysql/Makefile.shared:
added cp932, eucjp_ms character set
mysys/charset-def.c:
added cp932, eucjp_ms character set
sql/share/charsets/Index.xml:
added cp932, eucjp_ms character set
strings/Makefile.am:
added cp932, eucjp_ms character set
sql/ha_federated.cc:
Change mode to -rw-rw-r--
myisam/mi_create.c:
Ensure that all referenced memory is reset
mysql-test/r/type_timestamp.result:
More tests
mysql-test/t/func_compress.test:
Added comment
mysql-test/t/type_timestamp.test:
More tests
sql/field.h:
Count number of varchars in table
sql/item_cmpfunc.cc:
Safety fix (to avoid warning from valgrind)
sql/opt_range.cc:
Simple optimzation
sql/sql_acl.cc:
Safety fix (to avoid warning from valgrind)
sql/sql_parse.cc:
Safety fix for prepared statements
sql/sql_show.cc:
Move variable declarations first in function
Remove hidden variable (it)
Remove accessing freed memory (table_list->table_name)
sql/sql_update.cc:
Compare records with varchars correctly
sql/table.cc:
Safety fix when running with purify/valgrind
Fix wrong memory reference in case of errors
sql/table.h:
Added counting of varchar fields
strings/ctype-mb.c:
Fill max_str properly
increased timeouts to see if more tests get started automatically
mysql-test/ndb/ndbcluster.sh:
increased timeouts to see if more tests get started automatically
Clean-up for the previous change: VARCHAR and trailing spaces.
mysql-test/t/strict.test:
Clean-up for the previous change: VARCHAR and trailing spaces.
mysql-test/r/strict.result:
Clean-up for the previous change: VARCHAR and trailing spaces.
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/strfunc.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Libraries changed
mysys/default.c:
get_defaults_files implementation added
sql/sql_base.cc:
merging
sql/sql_show.cc:
merging
into mysql.com:/home/jonas/src/mysql-5.0
mysql-test/r/ndb_index_ordered.result:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/ndb_index_ordered.result:
Test scan with invalid table version
mysql-test/t/ndb_index_ordered.test:
Test scan with invalid table version
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Set apiConnectstate= CS_ABORTING when receving a scan req with invalid
table version
mode".
Changed grammar rule for "type" token. Now we have one branch with
optional length specification for TIMESTAMP type instead of two separate
branches.
mysql-test/r/type_timestamp.result:
Added test case for bug #7418 "TIMESTAMP not always converted to DATETIME
in MAXDB mode".
mysql-test/t/type_timestamp.test:
Added test case for bug #7418 "TIMESTAMP not always converted to DATETIME
in MAXDB mode".
sql/sql_yacc.yy:
Changed rule for "type" token. Now we have one branch with optional
length specification for TIMESTAMP type instead of two separate branches.
This also gives us consistent behavior for TIMETSAMP in MAXDB mode.
Catch more fork() errors.
Moved sleep_until_file_created() here from "mysql-test-run.pl".
Improved debug output.
mtr_io.pl:
Improved mtr_get_opts_from_file(), try to mimic some sh.
mysql-test-run.pl:
Cleaned up the timeout handling.
Created new function environment_setup().
Corrected time zone handling.
Moved sleep_until_file_created() to "lib/mtr_process.pl".
Improved debug output.
mysql-test/mysql-test-run.pl:
Cleaned up the timeout handling.
Created new function environment_setup().
Corrected time zone handling.
Moved sleep_until_file_created() to "lib/mtr_process.pl".
Improved debug output.
mysql-test/lib/mtr_io.pl:
Improved mtr_get_opts_from_file(), try to mimic some sh.
mysql-test/lib/mtr_process.pl:
Catch more fork() errors.
Moved sleep_until_file_created() here from "mysql-test-run.pl".
Improved debug output.
removed grep event and added congestion event
more docs
changed some naming, expecially regarding severities
added config param for logevel for congestion
mysql-test/ndb/basic.result:
updated ndb_mgm test
mysql-test/ndb/restart.test:
updated ndb_mgm test
ndb/include/kernel/LogLevel.hpp:
removed grep event and added congestion event
ndb/include/mgmapi/mgmapi.h:
more docs
changed some naming, expecially regarding severities
ndb/include/mgmapi/mgmapi_config_parameters.h:
removed grep event and added congestion event
ndb/src/common/debugger/EventLogger.cpp:
removed grep event and added congestion event
ndb/src/mgmapi/mgmapi.cpp:
changed some naming, expecially regarding severities
ndb/src/mgmsrv/ConfigInfo.cpp:
added config param for logevel for congestion
ndb/src/mgmsrv/Services.cpp:
just som variable name changes
Fix ndb_limit, handle cmpDate of length 3
Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/r/ndb_charset.result:
Remove ucs2 test as it requires one to configure --with-extra-charsets
mysql-test/t/ndb_charset.test:
Remove ucs2 test as it requires one to configure --with-extra-charsets
ndb/src/common/util/NdbSqlUtil.cpp:
Fix ndb_limit, handle cmpDate of length 3
into mysql.com:/home/jwinstead2/mysql-5.0-clean
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/ndb_index_ordered.result:
wl-1442 fix Time. adds new type id 25
mysql-test/t/ndb_index_ordered.test:
wl-1442 fix Time. adds new type id 25
ndb/include/kernel/signaldata/DictTabInfo.hpp:
wl-1442 fix Time. adds new type id 25
ndb/include/ndbapi/NdbDictionary.hpp:
wl-1442 fix Time. adds new type id 25
ndb/include/util/NdbSqlUtil.hpp:
wl-1442 fix Time. adds new type id 25
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1442 fix Time. adds new type id 25
ndb/src/ndbapi/NdbDictionary.cpp:
wl-1442 fix Time. adds new type id 25
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1442 fix Time. adds new type id 25
ndb/test/include/NdbSchemaOp.hpp:
wl-1442 fix Time. adds new type id 25
ndb/tools/restore/consumer.cpp:
wl-1442 fix Time. adds new type id 25
sql/ha_ndbcluster.cc:
wl-1442 fix Time. adds new type id 25
mysql-test/r/ndb_index_ordered.result:
wl-1442 fix Date. reuses old unused Timespec type id
mysql-test/t/ndb_index_ordered.test:
wl-1442 fix Date. reuses old unused Timespec type id
ndb/include/kernel/signaldata/DictTabInfo.hpp:
wl-1442 fix Date. reuses old unused Timespec type id
ndb/include/ndbapi/NdbDictionary.hpp:
wl-1442 fix Date. reuses old unused Timespec type id
ndb/include/util/NdbSqlUtil.hpp:
wl-1442 fix Date. reuses old unused Timespec type id
ndb/src/common/util/NdbSqlUtil.cpp:
wl-1442 fix Date. reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionary.cpp:
wl-1442 fix Date. reuses old unused Timespec type id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
wl-1442 fix Date. reuses old unused Timespec type id
ndb/test/include/NdbSchemaOp.hpp:
wl-1442 fix Date. reuses old unused Timespec type id
ndb/tools/restore/consumer.cpp:
wl-1442 fix Date. reuses old unused Timespec type id
sql/ha_ndbcluster.cc:
wl-1442 fix Date. reuses old unused Timespec type id
