Commit graph

65819 commits

Author SHA1 Message Date
Jimmy Yang
662fb84a42 Fix Bug #57600 output of I/O sum[%lu] can go negative
rb://532 approved by Sunny Bains
2010-12-09 01:19:46 -08:00
Georgi Kodinov
4ced023cb8 null-merge of the backport to 5.1 2010-12-08 16:21:03 +02:00
Georgi Kodinov
3190d45423 Backport of the 5.1 fix for bug #55826 to 5.0 2010-12-08 16:05:26 +02:00
unknown
1bbb55a260 MBug#687320: Fix sporadic test failures in innodb_mysql.test and partition_innodb_semi_consistent.test
Problem is that these tests run with --innodb-lock-wait-timeout=2 in .opt
(and this is necessary as built-in innodb does not allow to change this
dynamically). This cases another part of the test to occasionally time
out an UPDATE, which subsequently caused the test case to timeout due to
waiting for a condition (successful UPDATE) that never occurs.

Fixed by re-trying the update in case of timeout.

Tested by inserting a sleep() in the connection that the UPDATE is waiting
for, and checking that the retry loops a couple of times until the other
connection is done and COMMITs.
2010-12-08 14:34:08 +01:00
Igor Babaev
adb9fd9578 Made sure that SELECT from the test case for bug BUG#56862/64041 uses
the same execution plan that is in the output of the corresponding
EXPLAIN.
2010-12-07 14:48:04 -08:00
Luis Soares
ffc16a2d06 BUG#46166
Post merge fix. In write_incident, check if binlog file is
opened before actually trying to write the incident event.
2010-12-07 15:48:18 +00:00
Luis Soares
b1e163c2b1 BUG#46166
Automerged bzr bundle from bug report.
2010-12-07 15:46:10 +00:00
Davi Arnaut
608948a2d3 Bug#57991: Compiler flag change build error : adler32.c
Do not use the same maintainer mode flags for both GCC and ICC.
The -Wall option for ICC enables more warnings than its GCC
counterpart.
2010-12-07 13:06:20 -02:00
Dmitry Shulga
5ca6880def Fixed bug#54486 - assert in my_seek, concurrent
DROP/CREATE SCHEMA, CREATE TABLE, REPAIR.

The cause of assert was concurrent execution of
DROP DATABASE and REPAIR TABLE where first statement
deleted table's file .TMD at the same time as
REPAIR TABLE tried to read file details from the old file
that was just removed.

Additionally was fixed trouble when DROP TABLE try delete
all files belong to table being dropped at the same time
when REPAIR TABLE statement has just deleted .TMD file.

No regression test added because this would require adding a
sync point to mysys/my_redel.c. Since this bug is not present in
5.5+, adding test coverage was considered unnecessary.
The patch has been verified using RQG testing.


sql/sql_db.cc:
  mysql_rm_known_files() modified: ignore possible ENOENT error
  when trying delete all table's files. Such aggressive 
  algorithm permits skip already deleted (in another thread)
  files.
  
  Installation of Drop_table_error_handler as internal error handler
  moved from mysql_rm_db() to mysql_rm_knowns_files() near to place
  where source of possible errors (call to mysql_rm_table_part2) located.
storage/myisam/mi_check.c:
  mi_repair() was modified: set param->retry_repair= 0
  in order to don't call following failover procedure
  in ha_myisam::repair().
2010-12-10 13:48:50 +06:00
Bjorn Munch
50d1f9f368 merge from 5.1-mtr 2010-12-09 20:32:47 +01:00
Bjorn Munch
1008827107 Bug #58511 mysqltest doesn't always run statements in ps mode
mysqltest checks if the stmt is one that should be run in ps mode,
  but regexp doesn't match if preceeded by /* */ comment.
Fix: match function will jump over /*..*/ if found at start
2010-12-09 14:43:42 +01:00
Bjorn Munch
e70cb01d08 Bug #58522 mtr --debug leaks memory when test fails
Backported use of setenv() from 5.5
This will remove the leak on systems that have setenv()
I have not fixed the string.c leak, it's a local variable
   that the cleanup function cannot access.
2010-12-09 14:42:04 +01:00
Bjorn Munch
b5fdbcb2fe Bug #58608 mysqltestrun --help incongruences
Fixed some errors
Added note about 'no' prefix to options
See also follow-up comment to bug report
2010-12-09 14:40:36 +01:00
Luis Soares
3cecccffaf BUG#58416
Automerging bzr bundle from bug report into latest 
mysql-5.1-bugteam.
2010-12-07 14:26:20 +00:00
Vladislav Vaintroub
077d96c2a7 merge LP Bug#686184 2010-12-07 00:14:16 +01:00
Vladislav Vaintroub
3fb8bc165e Fix myisam_crash_before_flush_keys on Windows
Problem : mtr reports test failure because it sees
[ERROR] mysqld got exception 0x80000003 ;
in the .err file

The exception comes from DBUG_EXECUTE_IF (.. abort())

Fix:  use DBUG_ABORT instead of abort() - it does not throw 
any exceptions.
2010-12-07 00:10:09 +01:00
Vladislav Vaintroub
60722bca7b Fix LP Bug#686184 - merge_debug test fails.
The reason for failure is that DBUG_EXECUTE_IF in mi_open()
only worked for Unix-formatted file names, due to strstr(name, "/crashed")

The fix change strstr() above to strstr(name, "crashed"), to it can work with 
Windows file names as well.
2010-12-06 22:34:50 +01:00
Gleb Shchepa
e5a88caf08 Bug #57187: more user variable fun with multiple
assignments and comparison in query

A query that compares assignments of the same
user variable caused Valgrind warnings: access
to freed memory region.

In case of a DECIMAL argument the assignment
operator (:=) may return a pointer to a stored
value instead of its copy when evaluated.
The next assignment to the same variable may:
 a) overwrite the stored value with a new one
    and return the same pointer or even
 b) reallocate stored value.

Thus, if we evaluate an assignment and keep
the result pointer and then evaluate another
assignment to the same variable, then the
kept result pointer of the first assignment
will point to unexpectedly changed data or
it may be a dead pointer.

That may cause wrong data or crash.

The user_var_entry::val_decimal method has
been modified to copy user variable data.


mysql-test/r/user_var.result:
  Test case for bug #57187.
mysql-test/t/user_var.test:
  Test case for bug #57187.
sql/item_func.cc:
  Bug #57187: more user variable fun with multiple
              assignments and comparison in query
  
  The user_var_entry::val_decimal method has
  been modified to copy user variable data.
2010-12-06 23:38:31 +03:00
Vladislav Vaintroub
bfcc62c748 merge 2010-12-06 13:16:49 +01:00
Vladislav Vaintroub
6ad448115b merge 2010-12-06 13:01:23 +01:00
Vladislav Vaintroub
0eae06c430 Bug#473914: mysql_client_test fail with in debug compilaton on windows x64
Reason: inconsistent compilation, federatedx is compiled without SAFEMALLOC
flag, while anything else is compiled with SAFEMALLOC.

As a consequence, my_hash_init used inside federatedx initialization does not
provide correct caller info parameters (file, line) , so they are initialized with 
whatever is on stack. When info about allocated memory is output in
COM_DEBUG command, the server crashes trying to output string starting at
0xcccccccccccccccc.

The fix is to remove SAFEMALLOC  preprocessor flags 
from every CMakeLists.txt, except the top-level one.

Also, SAFEMALLOC is not defined by default now, instead
there is WITH_DEBUG_FULL CMake option which adds 
-DSAFEMALLOC to C and C++ flags in debug compilation. 
This option is off by  default, because 
1) Debug C runtime already has heap debugging builtin with 
 overwrite and leak detection
2)safemalloc considerably slows down the tests.


Note also  that 
- SAFEMALLOC is gone  in MySQL5.5
- On Windows, heap related overflows can also be found using free pageheap utility
(that is also part of application verifier). This is even more efficient if there are no other layers 
on top of Windows heap allocator, e.g  it is most efficient with release version.
2010-12-06 12:52:06 +01:00
Michael Widenius
ca94028a36 Fixed test case to be repeatable (after discussion with Igor) 2010-12-06 11:25:04 +02:00
Michael Widenius
42746a44a2 Merge with 5.1-release 2010-12-06 11:24:12 +02:00
Vasil Dimov
70bcb65bb6 Merge mysql-5.1-bugteam -> mysql-5.1-innodb 2010-12-05 21:16:13 +02:00
Michael Widenius
b3c72b9a02 Removed compiler warning 2010-12-05 19:46:39 +02:00
Michael Widenius
6061a11d36 merge with 5.1-release 2010-12-05 15:10:12 +02:00
Michael Widenius
a585745d4f Fixes to not trigger end-consistency testing of pagecache.
- Moved end_pagecache() to after maria_close()
- Flush page cache before closing files (in maria_pack)
Fixed test suite failure for PBXT

mysql-test/suite/pbxt/r/select.result:
  We mask out the 'rows' column because it may differ from run to run
mysql-test/suite/pbxt/t/select.test:
  We mask out the 'rows' column because it may differ from run to run
storage/maria/maria_chk.c:
  Moved end_pagecache() to after maria_close() to not trigger end-consistency testing of pagecache.
storage/maria/maria_pack.c:
  Moved end_pagecache() to after maria_close() to not trigger end-consistency testing of pagecache.
  flush page cache before closing files.
2010-12-05 14:25:01 +02:00
unknown
657e83cf4d The assert removed because it do not take into account case when previous and this buffers used for first time but previous buffer was not sent to disk yet (i.e. previous buffer was never sent to disk yet). 2010-12-05 01:12:10 +02:00
Michael Widenius
bafceea14f Automatic merge 2010-12-04 23:18:46 +02:00
Michael Widenius
dfefc15db4 Automatic merge with 5.1-release 2010-12-04 23:00:22 +02:00
unknown
6120fbace4 Aria unit tests fixed to have correct pagecache shutdown.
The Aria multithread test unlocked.

storage/maria/unittest/ma_pagecache_consist.c:
  Fixed pagecache shutdown.
storage/maria/unittest/ma_pagecache_rwconsist.c:
  Fixed pagecache shutdown.
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
  The Aria multithread test unlocked.
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
  Fixed pagecache shutdown.
2010-12-04 18:31:11 +02:00
Michael Widenius
a924325656 Merge with 5.1 2010-12-04 16:32:42 +02:00
Michael Widenius
26eb30d07f automatic merge with 5.1-release 2010-12-04 13:17:22 +02:00
Michael Widenius
6a5570789e Removed assert as gcc on gentoo couldn't compile it without a warning :(
(Not critical, we will just catch the error later)
2010-12-04 13:15:16 +02:00
Michael Widenius
9baab6f5e3 Fixed (wrong) compiler warning 2010-12-04 12:54:35 +02:00
Michael Widenius
6426564753 Fixed compiler warnings but calling field->store(longlong, unsigned_flag) with proper arguments. 2010-12-04 12:35:41 +02:00
Michael Widenius
7fc6086192 Automatic merge with 5.1-release 2010-12-04 12:27:51 +02:00
Michael Widenius
8938ed57a4 Fixed compiler warning
Added missing inc_counter_for_resize_op(pagecache).
(caused maria.maria-preload.test to fail)

storage/maria/ma_loghandler.c:
  Fixed compiler warning
storage/maria/ma_pagecache.c:
  Added missing inc_counter_for_resize_op(pagecache).
  (caused maria.maria-preload.test to fail)
2010-12-04 12:21:24 +02:00
Michael Widenius
d0ad135b60 Fixed compiler warnings.
Fixed timing test failures.
Fixed a failure in the Aria engines page cache and log handler (found with maria.maria-big test)
- This could cause a core dump when deleting big blobs.
- Added test to end_pagecache() to verify that page cache was correctly used.
  - inc_counter_for_resize_op and dec_counter_for_resize_op are called same number of times.
  - All page cache blocks was properly deallocated (empty)


mysql-test/suite/innodb/t/innodb_bug38231.test:
  Fixed timing issue (code comment says it all)
mysql-test/suite/innodb_plugin/t/innodb_bug38231.test:
  Fixed timing issue (code comment says it all)
sql/debug_sync.cc:
  Fixed compiler warning
storage/maria/ma_loghandler.c:
  Fixed bug found by maria.maria-big test:
  - Fixed race condition between update thread logging a very big blog and checkpoint thread.
storage/maria/ma_pagecache.c:
  Added assert to ensure mutex was properly locked.
  Added test to end_pagecache() to verify that page cache was correctly used.
  - inc_counter_for_resize_op and dec_counter_for_resize_op are called same number of times.
  - All page cache blocks was properly deallocated (empty)
  In pagecache_delete_internal(), properly reset counters and pins if functions aborts.
  Added missing inc_counter_for_resize_op() to pagecache_wait_lock().
  Added missing dec_counter_for_resize_op() to pagecache_delete()
2010-12-03 23:19:13 +02:00
Luis Soares
844138c90b BUG#46697: Table name in error message is not populated
When a query fails with a different error on the slave,
the sql thread outputs a message (M) containing:

  1. the error message format for the master error code
  2. the master error code
  3. the error message for the slave's error code
  4. the slave error code

Given that the slave has no information on the error message
itself that the master outputs, it can only print its own
version of the message format (but stripped from the 
additional data if the message format requires). This may
confuse users.

To fix this we augment the slave's message (M) to explicitly
state that the master's message is actually an error message 
format, the one associated with the given master error code 
and that the slave server knows about.
2010-12-03 17:17:45 +00:00
Georgi Kodinov
6428e19684 null merge of the backport of bug #55564 2010-12-03 17:01:13 +02:00
Georgi Kodinov
a4b106c882 Backport of bug #55564 to 5.0-security 2010-12-03 16:56:36 +02:00
Vladislav Vaintroub
91a72ee314 merge 2010-12-02 18:33:25 +01:00
Vladislav Vaintroub
8b4b8c8e65 merge 2010-12-02 16:19:28 +01:00
Vladislav Vaintroub
ea72880659 address review comments 2010-12-02 15:56:25 +01:00
unknown
d08e5cfad2 Fix problems seen in Buildbot:
- Make sure creation of t1 is replicated before trying to create trigger on it on slave
 - Use safe #ifdef for declaration as for definition to avoid warning about unused static function.
2010-12-02 09:48:30 +01:00
Mats Kindahl
078ed28181 Merging with mysql-5.1-bugteam 2010-12-02 09:14:21 +01:00
Mats Kindahl
8888e65229 BUG#58246: INSTALL PLUGIN not secure & crashable
Fixing test case that fails on Windows because .dll is used.
2010-12-02 09:13:31 +01:00
Tor Didriksen
d56a6dd027 BUG#58246 post-push fix broken DBG build. 2010-12-02 08:14:43 +01:00
Vladislav Vaintroub
2f7a1564bb Adapt fix_vs_config_dir () for VS2010
MTR_VS_CONFIG is now determined by looking at parent directory 
of sql\*\mysqld.exe,  instead of looking at *\*\BuildLog.htm

Reason : VS2010 does not create BuildLog.htm, hence prior method did not work.
2010-12-01 23:28:47 +01:00