- 04 Jun, 2007 2 commits
-
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.1-engines mysys/my_seek.c: Auto merged
-
unknown authored
Original problem was fixed by Magnus (see BUG25807). Currently only windows debug build causes assertion failure. This patch assures that my_tell gets correct file descriptor on any platform by DBUG_ASSERT macro. mysys/my_seek.c: Added assertion in case my_tell gets wrong file descriptor.
-
- 01 Jun, 2007 3 commits
-
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG28574/mysql-5.1-engines sql/lock.cc: Auto merged
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG28574/mysql-5.0-engines sql/lock.cc: SCCS merged
-
unknown authored
corruption errors: 126,134,145 When one thread attempts to lock two (or more) tables and another thread executes statement that aborts these locks (e.g. REPAIR TABLE) we may get a table object with wrong lock type in a table cache. For example if SELECT FROM t1,t2 was aborted, subsequent INSERT INTO t1 may be executed under read lock. As a result we may get various table corruptions and even a server crash. This is fixed by resetting lock type in case lock was aborted by another thread. I failed to create reasonable test case for this bug. sql/lock.cc: If thr_multi_lock was aborted by another thread, it unlocks tables that were locked before one that was aborted. Lock type for tables that were after a table that was aborted preserved. Thus we need to reset lock data in case thr_multi_lock was aborted.
-
- 31 May, 2007 6 commits
-
-
unknown authored
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-axmrg include/keycache.h: Auto merged mysql-test/r/key_cache.result: Auto merged sql/mysqld.cc: Auto merged mysys/mf_keycache.c: SCCS merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-axmrg sql/ha_ndbcluster.cc: Auto merged sql/set_var.cc: Auto merged storage/myisam/ft_nlq_search.c: Auto merged sql/sql_plugin.cc: Manual merge storage/myisam/ft_boolean_search.c: Manual merge
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-axmrg sql/mysqld.cc: Auto merged
-
unknown authored
Setting a key_cache_block_size which is not a power of 2 could corrupt MyISAM tables. A couple of computations in the key cache code use bit operations which do only work if key_cache_block_size is a power of 2. Replaced bit operations by arithmetic operations to make key cache able to handle block sizes that are not a power of 2. include/keycache.h: Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables Removed element 'key_cache_shift' from KEY_CACHE after the changes in mf_keycache.c made it unused. mysql-test/r/key_cache.result: Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables Added test result mysql-test/t/key_cache.test: Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables Added test mysys/mf_keycache.c: Bug#28478 - Improper key_cache_block_size corrupts MyISAM tables Replaced bit operations by arithmetic operations to make key cache able to handle block sizes that are not a power of 2.
-
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.
-
- 28 May, 2007 3 commits
-
-
unknown authored
Fixed a bug that came in merge. client/mysqltest.c: Changed accidently added tabs back into spaces. mysys/array.c: Changed accidently added tabs back into spaces. sql/set_var.cc: Changed accidently added tabs back into spaces. sql/sql_insert.cc: Removed accidently included line in merge. sql/sql_yacc.yy: Changed accidently added tabs back into spaces.
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-axmrg
-
unknown authored
Check value returned by parser->parse(). Better handle situations when it fails. storage/myisam/ft_boolean_search.c: Check value returned by parser->parse(). storage/myisam/ft_nlq_search.c: Check value returned by parser->parse().
-
- 26 May, 2007 1 commit
-
-
unknown authored
into xiphis.org:/home/antony/work2/wl1722.2-5.1
-
- 25 May, 2007 2 commits
-
-
unknown authored
String variables not readable by using @@name. Required for WL1722. sql/set_var.cc: Missing functionality in WL2936: String variables not readable by using @@name.
-
unknown authored
into chilla.local:/home/mydev/mysql-5.1-axmrg mysql-test/mysql-test-run.pl: Auto merged sql/ha_ndbcluster.cc: Auto merged
-
- 24 May, 2007 14 commits
-
-
unknown authored
"sql_plugin.cc, dynamic_array is not dynamic" When the DYNAMIC_ARRAYs were resized, pointers became invalid. Solved by only storing pointers within the DYNAMIC_ARRAYs. sql/sql_plugin.cc: Bug27836 Store pointers to data structures in dynamic arrays: plugin_dl_array, plugin_array Allocate data structures in plugin_mem_root
-
unknown authored
into linux-th5m.site:/home/my/mysql-5.1-marvel include/my_global.h: Auto merged sql/item_func.cc: Auto merged strings/strtod.c: Auto merged
-
unknown authored
-
unknown authored
-
unknown authored
into trift2.:/MySQL/M51/push-5.1
-
unknown authored
Makefile.am: The "test-bt" target was lacking "embedded" tests - add them, dependent on the build of the test binary needed for them.
-
unknown authored
into linux-th5m.site:/home/my/mysql-5.1-marvel include/keycache.h: Auto merged include/my_sys.h: Auto merged mysys/my_static.c: Auto merged sql/handler.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_udf.cc: Auto merged storage/blackhole/ha_blackhole.cc: Auto merged storage/blackhole/ha_blackhole.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_preload.c: Auto merged mysys/mf_keycache.c: Manual merge from main 5.1
-
unknown authored
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel BitKeeper/etc/ignore: auto-union client/mysql.cc: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/comp_err.c: Auto merged include/decimal.h: Auto merged include/my_getopt.h: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged mysys/array.c: Auto merged mysys/hash.c: Auto merged mysys/typelib.c: Auto merged sql/derror.cc: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/field.cc: Auto merged sql/filesort.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/my_decimal.cc: Auto merged sql/my_decimal.h: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol.h: Auto merged sql/rpl_utility.h: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_connect.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.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_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/structs.h: Auto merged sql/table.h: Auto merged sql/tztime.cc: Auto merged sql/unireg.cc: Auto merged storage/example/ha_example.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/heap/ha_heap.cc: Auto merged storage/innobase/handler/ha_innodb.h: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/sort.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/ndb/tools/restore/consumer_restore.cpp: Auto merged strings/decimal.c: Auto merged strings/strtod.c: Auto merged include/hash.h: Manual merge with 5.1 main tree. mysys/my_getopt.c: Manual merge with 5.1 main tree. sql/field.h: Manual merge with 5.1 main tree. sql/ha_ndbcluster.cc: Manual merge with 5.1 main tree. sql/item_cmpfunc.h: Manual merge with 5.1 main tree. sql/item_create.cc: Manual merge with 5.1 main tree. sql/item_func.h: Manual merge with 5.1 main tree. sql/key.cc: Manual merge with 5.1 main tree. sql/lock.cc: Manual merge with 5.1 main tree. sql/mysqld.cc: Manual merge with 5.1 main tree. sql/set_var.cc: Manual merge with 5.1 main tree. sql/set_var.h: Manual merge with 5.1 main tree. sql/sql_base.cc: Manual merge with 5.1 main tree. sql/sql_handler.cc: Manual merge with 5.1 main tree. sql/sql_insert.cc: Manual merge with 5.1 main tree. sql/sql_plugin.cc: Manual merge with 5.1 main tree. sql/sql_table.cc: Manual merge with 5.1 main tree. sql/sql_yacc.yy: Manual merge with 5.1 main tree. sql/table.cc: Manual merge with 5.1 main tree. storage/innobase/handler/ha_innodb.cc: Manual merge with 5.1 main tree. storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Manual merge with 5.1 main tree. storage/ndb/tools/restore/restore_main.cpp: Manual merge with 5.1 main tree.
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build configure.in: Auto merged include/my_global.h: Auto merged sql/item_func.cc: Auto merged strings/strtod.c: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build configure.in: Auto merged include/my_global.h: Auto merged sql/item_func.cc: Auto merged strings/strtod.c: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: Auto merged include/my_global.h: Auto merged sql/item_func.cc: Auto merged strings/strtod.c: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
-
- 23 May, 2007 9 commits
-
-
unknown authored
into trift2.:/MySQL/M51/push-5.1
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build configure.in: Auto merged include/my_global.h: Auto merged sql/item_func.cc: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~13: Auto merged
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: Auto merged sql/item_func.cc: Auto merged
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: Auto merged sql/handler.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
-
unknown authored
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
-