- 01 Jun, 2007 1 commit
-
-
unknown authored
into bodhi.(none):/opt/local/work/mysql-5.1-runtime client/mysqlbinlog.cc: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/t/disabled.def: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/field.h: Auto merged sql/filesort.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item_func.h: Auto merged sql/item_xmlfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.h: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_test.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/heap/hp_hash.c: Auto merged tests/mysql_client_test.c: Auto merged sql/item_func.cc: Manual merge. sql/sp.cc: Manual merge. sql/sql_cache.cc: Manual merge. sql/sql_table.cc: Manual merge. strings/my_vsnprintf.c: Manual merge.
-
- 31 May, 2007 5 commits
-
-
unknown authored
```yaml Added casts and fixed wrong type. ``` Added casts and fixed wrong type. --- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel --- Don't give warning that readonly variable is forced to be readonly mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file Fixed wrong reference to the mysql manual Fixed wrong prototype that caused some tests to fail on 64 bit platforms --- Disabled compiler warnings mainly for Win 64. --- Added casts to remove compiler warnings on windows Give warnings also for safe_mutex errors found by test system Added some warnings from different machines in pushbuild --- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into mysql.com:/home/my/mysql-5.1 --- Added escapes for double quotes and parenthesis. --- Archive db fix plus added non-critical warnings in ignore list. --- Fixed previously added patch and added new ignored warning. client/mysqltest.c: Added casts to avoid compiler warnings. --- Added casts to avoid compiler warnings. mysql-test/lib/mtr_report.pl: Test run now fails if we have [Warning] and [ERROR] as tags in .err file Added list of all common 'not fatal' errors to ignore error list --- Give warnings also for safe_mutex errors Added some warnings from different machines in pushbuild --- Added escapes for double quotes and parenthesis. --- Added non-critical warnings to be ignored. --- Fixed a wrong regexp Added new non-critical warning mysql-test/mysql-test-run-shell.sh: Fixed some wrong startup options mysql-test/r/func_misc.result: Test case for archive db fix. mysql-test/t/disabled.def: Disable instance manager tests because they generate warnings (and probably don't read the option files correctly) mysql-test/t/func_misc.test: Test case for archive db fix. mysys/array.c: Added casts to avoid compiler warnings. mysys/hash.c: Added casts to avoid compiler warnings. mysys/my_compress.c: Added casts to remove compiler warnings on windows mysys/my_conio.c: To avoid a warning from compiler. mysys/my_pread.c: Archive db fix. mysys/my_quick.c: Added cast to avoid compiler warning. --- Added cast to avoid compiler warning. sql/ha_ndbcluster_binlog.cc: Ensure we log all binglog errors with the "NDB Binlog" tag sql/ha_partition.cc: result is type bool, so calculation should be forced to that also. sql/log.cc: Fixed compiler problem on Solaris. sql/slave.cc: Make errors uniform sql/sql_class.cc: Added cast to remove compiler warnings on windows sql/sql_map.cc: Added casts to avoid compiler warnings. --- Added casts to avoid compiler warnings. sql/sql_plugin.cc: Fixed wrong type. --- Don't give warning that readonly variable is forced to be readonly sql/stacktrace.c: Corrected manual reference storage/archive/azio.c: Archive db fix. --- Fixed previously added patch. storage/blackhole/ha_blackhole.cc: Fixed wrong prototype that caused test to fail on 64 bit platforms storage/example/ha_example.cc: Fixed wrong prototype that caused test to fail on 64 bit platforms strings/ctype-ucs2.c: Fixed wrong type. --- Fixed wrong type. support-files/compiler_warnings.supp: Added new disabled warnings for Win 64.
-
unknown authored
-
unknown authored
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl mysql-test/t/disabled.def: Manual merge
-
unknown authored
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl include/config-win.h: Auto merged mysql-test/t/disabled.def: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_update.cc: Auto merged
-
unknown authored
into mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl mysql-test/t/disabled.def: Auto merged
-
- 30 May, 2007 25 commits
-
-
unknown authored
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0 mysql-test/t/binlog_killed.test: manual merge bug#22725 test
-
unknown authored
refining the test because of Bug #28786 'reset master' does not reset binlogging on embeded server mysql-test/t/binlog_killed.test: the test can not pass on embedded server. Setting the include-guard.
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_view.cc: Auto merged
-
unknown authored
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
-
unknown authored
mysql-test/r/rpl_ndb_basic.result: Masking out error that is not generated by the test itself mysql-test/t/rpl_ndb_basic.test: Masking out error that is not generated by the test itself
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
-
unknown authored
the test is not supposed for row format. the include-guard is set. mysql-test/t/binlog_killed.test: the test does not apply to rbr
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
-
unknown authored
Adding strnlen.c into the list of source files. strings/CMakeLists.txt: Adding strnlen.c into the list of source files.
-
unknown authored
2. Use multibyte-safe constant. sql/sp.cc: Fix memory leak. sql/sp_head.cc: Use multibyte-safe constant.
-
unknown authored
fixing FD event issue that showed up on pb. client/mysqlbinlog.cc: resetting temp_buf specially for FD event to avoid double-freeing
-
unknown authored
into mysql.com:/home/bar/mysql-5.1.b28558
-
unknown authored
include/config-win.h: strnlen() presents in the build in library only starting from Visual Studio 2005, identified by _MSC_VER 1400. Previous versions of Visual Studio didn't have this function, so they need the MySQL replacement function to be compiled.
-
unknown authored
Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour) mysql-test/r/rpl_incident.result: Masking master_log_file since IO thread is not synchronized in rpl_incident.test mysql-test/t/rpl_incident.test: Masking master_log_file since IO thread is not synchronized in rpl_incident.test Correcting drop of table so it is synchronized sql/log_event.cc: Added extra parenthesis to remove compiler warning
-
unknown authored
The source of the problem was in my_vsnprintf() implementation. strings/my_vsnprintf.c: Fixing a problem in vsnprintf('%.*s', len, ptr) When processing the above format, it's incorrect to use strlen() because the string is not necessarily a null terminated string. Changing strlen() followed by set_if_smaller() to strnlen() - which covers both cases - limiting by '\0' and by "len".
-
unknown authored
Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27044_slave_dup2unique into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0 sql/log_event.cc: Auto merged
-
unknown authored
merge 5.0 with 5.1 mysql-test/t/binlog_killed.test: offset change in 5.1
-
unknown authored
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
-
unknown authored
test comments correction mysql-test/r/binlog_killed.result: changed mysql-test/t/binlog_killed.test: wrong comments (but important ones) left; little refinement in result calc
-
unknown authored
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
-
- 29 May, 2007 9 commits
-
-
unknown authored
combining the final result variable in such way that either option of the test execution will yield zero. mysql-test/r/binlog_killed.result: results changed mysql-test/t/binlog_killed.test: there are two options for the test passing: 1. no rows inserted and the INSERT gets killed, then there is no INSERT query in binlog 2. all rows inserted, then INSERT gets to binlog and error_code is zero
-
unknown authored
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge sql/sp_head.cc: Auto merged
-
unknown authored
sql/sp_head.cc: Manual merge, bug#27876 sql/sql_lex.cc: Manual merge, bug#27876 sql/sql_lex.h: Manual merge, bug#27876 sql/sql_view.cc: Manual merge, bug#27876 tests/mysql_client_test.c: Manual merge, bug#27876
-
unknown authored
tests refining, see binlog_killed.test file for details mysql-test/r/binlog_killed.result: results changed mysql-test/t/binlog_killed.test: killer conn waits for the first row to appear; log-disabling kill query since prey's id is not deterministic; correcting pattern to search in binlog for insert query;
-
unknown authored
merge with 5.0 sql/sql_class.cc: THD::binlog_query receives killed status arg with default the same for Query_log_event sql/sql_class.h: relocation public binlog_query down to the point where killed_state is declared
-
unknown authored
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0 sql/sql_insert.cc: Auto merged
-
unknown authored
refining the test. mysql-test/t/binlog_killed.test: due to killing reap may catch an error though it's indeterministic.
-
unknown authored
into ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-cs-3
-
unknown authored
1. Refactor sp_show_create_function() and sp_show_create_procedure() into show_create_routine(). 2. Code cleanup: eliminate proxy functions. sql/sp.cc: Code cleanup: eliminate proxy functions. sql/sp.h: Code cleanup: eliminate proxy functions. sql/sp_head.cc: 1. Refactor sp_show_create_function() and sp_show_create_procedure() into show_create_routine(). 2. Code cleanup: eliminate proxy functions. sql/sp_head.h: 1. Refactor sp_show_create_function() and sp_show_create_procedure() into show_create_routine(). 2. Code cleanup: eliminate proxy functions. sql/sql_parse.cc: Code cleanup: use new functions.
-