- 23 Apr, 2007 2 commits
-
-
unknown authored
into debian.(none):/M51/bug14685-5.1
-
unknown authored
in a build "--without-server". Fix for bug#14685 dbug/dbug_analyze.c: In a build "--without-server", the libraries will be built without threading. In this case, "my_thread_global_init()" is missing in the libraries, and the linker will report an unresolved symbol. Avoid this error by making the call to "my_thread_global_init()" depend on "#ifdef THREAD". Fix for bug#14685
-
- 20 Apr, 2007 4 commits
-
-
unknown authored
into debian.(none):/M51/push-5.1 configure.in: Manual merge - no change in 5.1
-
unknown authored
into debian.(none):/M51/push-5.1 sql/ha_ndbcluster.cc: Auto merged sql/sql_delete.cc: Auto merged sql/mysqld.cc: Merge conflict - main tree has precedence.
-
unknown authored
into debian.(none):/M51/bug27739-5.1 configure.in: Auto merged
-
unknown authored
not some other tool (file system checker on Tru64). Patch originally supplied by Peter O'Gorman, slightly modified by me. Bug#27739 "build fails on Tru64 due to icheck test in configure" configure.in: We use "icheck" as a tool to check against ABI changes. However, some systems (like Tru64) have "icheck" as a file system checker. So if "icheck" is found, it should be verified that this really is the ABI checker and not some other tool. Patch originally supplied by Peter O'Gorman, slightly modified by me. Bug#27739 "build fails on Tru64 due to icheck test in configure"
-
- 18 Apr, 2007 6 commits
-
-
unknown authored
into debian.(none):/M50/push-5.0
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
into trift2.:/MySQL/M51/push-5.1
-
unknown authored
into trift2.:/MySQL/M51/push-5.1 sql/ha_ndbcluster.cc: Manual merge: Append "LL" to hex constants beyond 32 bit.
-
unknown authored
Hex constants that exceed 32 bit need to be marked "LL" for the compile to work. sql/ha_ndbcluster.cc: Hex constants that exceed 32 bit need to be marked "LL" for the compile to work (discovered on a Debian PPC box, 32-bit big-endian, running gcc 3.3.6).
-
unknown authored
into debian.(none):/M50/push-5.0 configure.in: Auto merged
-
- 17 Apr, 2007 15 commits
-
-
unknown authored
-
unknown authored
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel mysql-test/r/strict.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
into janus.mylan:/usr/home/serg/Abk/mysql-5.1-build sql/sql_delete.cc: Auto merged sql/sql_lex.cc: Auto merged
-
unknown authored
-
unknown authored
into trift2.:/MySQL/M51/limit-man-5.1 configure.in: Auto merged
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
-
unknown authored
into mysql.com:/home/my/mysql-5.1
-
unknown authored
(Removes some warnings about UNIX_TIMESTAMP from the slave.err logs) Marked federated_server as a '--big-test' Change error in net_clear to 'Note', as it interfered with mysql-test-run. client/mysqltest.c: More DBUG messages Adding missing DBUG_RETURN mysql-test/extra/rpl_tests/rpl_max_relay_size.test: Added missing sync_slave_with_master mysql-test/extra/rpl_tests/rpl_relayrotate.test: Added missing sync_slave_with_master mysql-test/include/federated.inc: Don't do stop slave before the slave has started properly (Removes some warnings about UNIX_TIMESTAMP from the slave.err logs) mysql-test/include/federated_cleanup.inc: Trivial cleanup mysql-test/t/federated_server.test: Don't run this unless under --big-test Made test-loop smaller. (We will find out errors in code over time, as the test is run under a lot of difference machines which will compensate for the smaller loop) mysql-test/t/rpl_flushlog_loop.test: Added missing sync_slave_with_master sql/net_serv.cc: Change error to Note (low level warning), as it interfered with mysql-test-run. This is probably fine as we in some context on sever shutdown can get information about connection shutdown on the connection while we are doing a query at the same time. Still, in normal context one should get this, so it's good to have it in the log as it enables one to find errors easier. sql/slave.cc: Added reason to why things failed to error message
-
unknown authored
into trift2.:/MySQL/M51/limit-man-5.1
-
unknown authored
into trift2.:/MySQL/M51/limit-man-5.1 Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1 configure.in: Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1
-
unknown authored
into janus.mylan:/usr/home/serg/Abk/mysql-5.0
-
unknown authored
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
also control the list of man pages installed, so that they correspond better to the binaries. This is the second version of this fix, including review comments. configure.in: Several of our man pages are specific to parts (table handlers, features, ...) which are controlled by "configure" options, so there are builds which do not include these parts. For such builds, remove those specific man pages from the list of man pages to be installed, so that the man pages correspond better to the binaries. In this patch, do it for NDB (modify Kent's approach), "embedded", and InnoDB. Ensure that the handling of the man pages is determined only after the options have been processed, the old nandling (NDB only) was done too early. This is the second version of this fix, including review comments.
-
- 16 Apr, 2007 5 commits
-
-
unknown authored
refining the test with active innodb mysql-test/r/sp_trans_log.result: changed mysql-test/t/sp_trans_log.test: innodb activated
-
unknown authored
tests for the bug and associated is moved into another file because they appeared to be binlog-format sensitive. mysql-test/r/sp_trans.result: results changed mysql-test/t/sp_trans.test: binlog format sensitive piece of test moved to sp_trans_log. mysql-test/r/sp_trans_log.result: new results mysql-test/t/sp_trans_log.test: binlog-format sensitive part of sp_trans.test
-
unknown authored
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems) Removed memory leak in mysql_test if sync_with_master fails. Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed. Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits" client/mysqltest.c: Added missing 'mysql_free_result' (fixed confusing memory leak when sync_with_master fails)ug mysql-test/mysql-test-run.pl: Add the test case name to the instance manager log files mysql-test/r/rpl_log_pos.result: Made test more portable (for powermac) mysql-test/t/disabled.def: Disabled im_life_cycle (added bug#27851) mysql-test/t/myisam-system.test: Use remove_file instead of "system rm" mysql-test/t/ndb_autodiscover.test: Use remove_file instead of "system rm" mysql-test/t/ndb_loaddatalocal.test: Use remove_file instead of "system rm" mysql-test/t/rpl_loaddatalocal.test: Use remove_file instead of "system rm" mysql-test/t/rpl_log_pos.test: Made test more portable (for powermac) mysql-test/t/rpl_misc_functions.test: Use remove_file instead of "system rm" mysql-test/t/rpl_rbr_to_sbr.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_NOW.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_sp001.test: Use remove_file instead of "system rm" mysql-test/t/rpl_row_sp011.test: Use remove_file instead of "system rm" mysql-test/t/show_check.test: Use remove_file instead of "system rm" mysys/my_alloc.c: Don't return on zero argument, as this may hide other errors server-tools/instance-manager/log.cc: Log errors to both stdout and stderr (to know in which context we got the error) server-tools/instance-manager/thread_registry.cc: Log error before common assert (to know in which context we fail) sql/ha_ndbcluster.cc: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql/ha_ndbcluster.h: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql/ha_ndbcluster_binlog.cc: Do not terminate ndb_cluster_binary_log before the util thread has finnished. sql-common/client.c: Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
into trift2.:/MySQL/M51/push-5.1
-
- 15 Apr, 2007 6 commits
-
-
unknown authored
After merge fix. mysql-test/r/subselect.result: After merge fix.
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt mysql-test/r/subselect3.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_union.cc: Auto merged mysql-test/r/subselect.result: Manual merge mysql-test/t/subselect.test: Manual merge
-
unknown authored
Fix warning after fix for bug#27321. sql/item.cc: Fix warning after fix for bug#27321.
-
unknown authored
After merge fix. mysql-test/r/subselect.result: After merge fix. mysql-test/t/subselect.test: After merge fix.
-
unknown authored
into moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysql mysql-test/r/subselect3.result: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: Manually merged mysql-test/t/subselect.test: Manually merged mysql-test/t/subselect3.test: Manually merged
-
unknown authored
The Item_outer_ref class based on the Item_direct_ref class was always used to represent an outer field. But if the outer select is a grouping one and the outer field isn't under an aggregate function which is aggregated in that outer select an Item_ref object should be used to represent such a field. If the outer select in which the outer field is resolved isn't grouping then the Item_field class should be used to represent such a field. This logic also should be used for an outer field resolved through its alias name. Now the Item_field::fix_outer_field() uses Item_outer_field objects to represent aliased and non-aliased outer fields for grouping outer selects only. Now the fix_inner_refs() function chooses which class to use to access outer field - the Item_ref or the Item_direct_ref. An object of the chosen class substitutes the original field in the Item_outer_ref object. The direct_ref and the found_in_select_list fields were added to the Item_outer_ref class. mysql-test/t/subselect3.test: Some test cases were corrected after the fix for the bug#27321. mysql-test/r/subselect3.result: Some test cases were corrected after the fix for the bug#27321. mysql-test/t/subselect.test: Added a test case for the bug#27321: Wrong subquery result in a grouping select. mysql-test/r/subselect.result: Added a test case for the bug#27321: Wrong subquery result in a grouping select. Some test cases were corrected after this fix. sql/sql_union.cc: Bug#27321: Wrong subquery result in a grouping select. Cleanup of the inner_refs_list. sql/sql_select.cc: Bug#27321: Wrong subquery result in a grouping select. Now the fix_inner_refs() function chooses which class to use to access outer field - the Item_ref or the Item_direct_ref. An object of the chosen class substitutes the original field in the Item_outer_ref object. A comment is corrected. sql/item.cc: Bug#27321: Wrong subquery result in a grouping select. Now the Item_field::fix_outer_field() uses Item_outer_field objects to represent aliased and non-aliased outer fields for grouping outer selects only. sql/item.h: Bug#27321: Wrong subquery result in a grouping select. The direct_ref and the found_in_select_list fields were added to the Item_outer_ref class.
-
- 14 Apr, 2007 2 commits