Commit graph

69240 commits

Author SHA1 Message Date
Mattias Jonsson
046b57450d merge 2011-04-20 18:00:50 +02:00
Mattias Jonsson
bd92ea4311 Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK
Update for previous patch according to reviewers comments.

Updated the constructors for ha_partitions to use the common
init_handler_variables functions

Added use of defines for size and offset to get better readability for the code that reads
and writes the .par file. Also refactored the get_from_handler_file function.
2011-04-20 17:52:33 +02:00
Mikael Ronstrom
f24588519c Fixed error in merge 2011-04-20 15:15:47 +02:00
Mikael Ronstrom
d31a06b6c9 Fixed missing change of thd_unlock_connection_data to thd_unlock_thread_count 2011-04-20 15:07:19 +02:00
Bjorn Munch
91eebaaef4 Bug #12379923 60907: MYSQL-TEST/LIB/MY/SAFEPROCESS/SAFE_PROCESS.PL USES HARDCODED SIGNAL NUMBE
Replaced the hardcoded 9 with 'KILL'
2011-04-20 14:58:53 +02:00
Jon Olav Hauglid
1d75aeb9a9 Null merge from mysql-5.1 to mysql-5.5 2011-04-20 12:36:30 +02:00
Jon Olav Hauglid
f3b024cafa BUG#12377872 ASSERTION FAILED: !_ENTERED WHEN GETHOSTBYADDR_R
FAILS ON SOLARIS

This assertion was triggered if gethostbyaddr_r cannot do a
reverse lookup on an ip address. The reason was a missing
DBUG_RETURN macro. The problem affected only debug versions of
the server.

This patch fixes the problem by replacing return with DBUG_RETURN.
No test case added.
2011-04-20 11:32:28 +02:00
Marko Mäkelä
f76a32c2aa Clarify a comment. 2011-04-20 11:29:10 +03:00
Sergey Glukhov
876c17aa94 5.1 -> 5.5 merge 2011-04-20 11:52:40 +04:00
Sergey Glukhov
90bbf9d615 Bug#11765923 58937: MANY VALGRIND ERRORS AFTER GROUPING BY RESULT OF DECIMAL COLUMN FUNCTION
Bug#11764671  57533: UNINITIALISED VALUES IN COPY_AND_CONVERT (SQL_STRING.CC) WITH CERTAIN CHA
When ROUND evaluates decimal result it uses Item::decimal
value as fraction value for the result. In some cases
Item::decimal is greater than real result fraction value
and uninitialised memory of result(decimal) buffer can be
used in further calculations. Issue is introduced by
Bug33143 fix. The fix is to remove erroneous assignment.


mysql-test/r/func_math.result:
  test case
mysql-test/t/func_math.test:
  test case
sql/item_func.cc:
  remove erroneous assignment
2011-04-20 11:39:20 +04:00
Marko Mäkelä
35e8093006 Remove a debug printout that is no longer needed. 2011-04-20 10:10:54 +03:00
Bjorn Munch
be2566351c Bug #12373916 MTR SHOULD FLAG PRESENCE OF VALGRIND MEMORY LEAK REPORTS IN A CLEARER WAY
Produce a pseudo test valgrind_reports.
Reports are generated by each worker, don't want one test for each.
Send message 'VALGREP' if report was found, master thread will pick this up
2011-04-19 14:01:32 +02:00
Serge Kozlov
4f8f6401c9 autocommit 5.1 -> 5.5 2011-04-19 00:08:25 +04:00
Serge Kozlov
dba184237a BUG#12371924
Update test case
2011-04-18 23:59:15 +04:00
Bjorn Munch
707bb08ef3 yet another silly redundant null upmerge 2011-04-18 15:37:01 +02:00
Bjorn Munch
060df92b2f Bug #12365486 MTR FAILS TO FIND WARNINGS IN SERVER LOG WITH --VALGRIND COMBINED WITH --DEBUG
With this combination, outoput was directed to .trace but not all
      parts of MTR was aware of this.
Replace .err with .trace at the earliest possible place
2011-04-18 15:35:14 +02:00
Bjorn Munch
84d498777f redundant upmerge 2011-04-18 15:30:49 +02:00
Bjorn Munch
1e99e19de5 Bug #12365486 MTR FAILS TO FIND WARNINGS IN SERVER LOG WITH --VALGRIND COMBINED WITH --DEBUG
With this combination, outoput was directed to .trace but not all
    parts of MTR was aware of this.
  Replace .err with .trace at the earliest possible place
2011-04-18 15:29:26 +02:00
Sven Sandberg
941c8e5a27 null merge 2011-04-18 14:48:15 +02:00
Sven Sandberg
7b1967ad4e test fails on more platforms, removed @freebsd from default.experimental. 2011-04-18 14:42:14 +02:00
Bjorn Munch
e849cf6441 upmerge 12365486 2011-04-18 13:59:35 +02:00
Bjorn Munch
bb533626fd Bug #12365486 MTR FAILS TO FIND WARNINGS IN SERVER LOG WITH --VALGRIND COMBINED WITH --DEBUG
With this combination, outoput was directed to .trace but not all
  parts of MTR was aware of this.
Replace .err with .trace at the earliest possible place
2011-04-18 11:47:14 +02:00
Martin Hansson
170f49102e Merge of test case for bug#11758558 - 50774 2011-04-18 10:46:17 +02:00
Martin Hansson
8dabe8aa92 Bug 11758558 - 50774: WRONG RESULTSET WHEN TIMESTAMP VALUES ARE APPENDED WITH
.0

The bug was fixed by the patch for bug number BUG 11763109 - 55779: SELECT
DOES NOT WORK PROPERLY IN MYSQL SERVER VERSION "5.1.42 SUSE MYSQL (Exact same
fix as was proposed for this bug.) Since the motivation for the two bug
reports was completely different, however, it still makes sense to push the
test case.

This patch contains only the test case.
2011-04-18 10:44:41 +02:00
Bjorn Munch
cf21a2d2e7 null upmerge 2011-04-16 17:43:20 +02:00
Bjorn Munch
15e2ce6d34 merge from 5.5-mtr 2011-04-16 17:14:29 +02:00
Bjorn Munch
5d53587949 merge from 5.1-mtr 2011-04-16 16:46:51 +02:00
Bjorn Munch
bb77d4e054 null upmerge 2011-04-15 16:23:31 +02:00
Mikael Ronström
8b8b0b2776 Merge 5.5, step 3 2011-04-15 15:58:30 +02:00
Bjorn Munch
8bd972e57f merge from 5.5 main 2011-04-15 15:55:08 +02:00
Bjorn Munch
0c36269494 merge from 5.1 main 2011-04-15 15:51:31 +02:00
Mikael Ronström
18da718b77 Merge step 2 2011-04-15 15:47:26 +02:00
Mikael Ronström
70ed67e1cc Merge 5.5 2011-04-15 15:46:11 +02:00
Alexander Nozdrin
060541c02e A patch for Bug#11763166 (55847: SHOW WARNINGS returns empty
result set when SQLEXCEPTION is active.

The problem was in a hackish THD::no_warnings_for_error attribute.
When it was set, an error was not written to Warning_info -- only
Diagnostics_area state was changed. That means, Diagnostics_area
might contain error state, which is not present in Warning_info.

The user-visible problem was that in some cases SHOW WARNINGS
returned empty result set (i.e. there were no warnings) while
the previous SQL statement failed. According to the MySQL
protocol errors must be presented in warning list.

The main idea of this patch is to remove THD::no_warnings_for_error.
There were few places where it was used:
  - sql_admin.cc, handling of REPAIR TABLE USE_FRM.
  - sql_show.cc, when calling fill_schema_table_from_frm().
  - sql_show.cc, when calling fill_table().
The fix is to either use internal-error-handlers, or to use
temporary Warning_info storing warnings, which might be ignored.

This patch is needed to fix Bug 11763162 (55843).
2011-04-15 16:02:22 +04:00
Mikael Ronström
55557e223f Changed name to better reflect function logic in accordance with WL#5788 2011-04-15 13:02:29 +02:00
Mikael Ronström
60f8d6ab09 Changed name to better reflect function logic in accordance with WL#5788 2011-04-15 13:00:59 +02:00
Mikael Ronström
7e3b316ecd Use C++ manner for unused param instead of C manner 2011-04-15 12:57:59 +02:00
Sergey Glukhov
98d524599a 5.1 -> 5.5 merge 2011-04-15 12:55:21 +04:00
Sergey Glukhov
bba7b9ca0c Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS AND WRITES WITH U
Some multibyte sequences could be considered by my_mbcharlen() functions
as multibyte character but more exact my_ismbchar() does not think so.
In such a case this multibyte sequences is pushed into 'stack' buffer which
is too small to accommodate the sequence.
The fix is to allocate stack buffer in
compliance with max character length.


mysql-test/r/loaddata.result:
  test case
mysql-test/t/loaddata.test:
  test case
sql/sql_load.cc:
  allocate stack buffer in compliance with max character length.
2011-04-15 12:51:34 +04:00
Bjorn Munch
34a312a7a5 upmerge 12351213,12360195 2011-04-15 10:37:20 +02:00
Bjorn Munch
c95227ca54 Bug #12360195 MTR DOES NOT IGNORE TABS IN EXPERIMENTAL FILE
Instead of just filtering space, filter white space (\s)
I left the default.experimental file as is, with tabs.
2011-04-15 10:30:52 +02:00
Tor Didriksen
9cd03942ab Merge fix for Bug#11765713 from 5.1 2011-04-15 08:54:05 +02:00
Tor Didriksen
dd3d9477b2 Bug#11765713 58705: OPTIMIZER LET ENGINE DEPEND ON UNINITIALIZED VALUES CREATED BY OPT_SUM_QU
Valgrind warnings were caused by comparing index values to an un-initialized field.


mysql-test/r/subselect.result:
  New test cases.
mysql-test/t/subselect.test:
  New test cases.
sql/opt_sum.cc:
  Add thd to opt_sum_query enabling it to test for errors.
  If we have a non-nullable index, we cannot use it to match null values,
  since set_null() will be ignored, and we might compare uninitialized data.
sql/sql_select.cc:
  Add thd to opt_sum_query, enabling it to test for errors.
sql/sql_select.h:
  Add thd to opt_sum_query, enabling it to test for errors.
2011-04-14 16:35:24 +02:00
Bjorn Munch
e675ed063e Bug #12351213 MTR --VS-CONFIG DOES NOT WORK LIKE MTR_VS_CONFIG
Fix for --vs-config applied
Find.pm incorrectly tested an unitialized local variable instead
  of the global, corrected.
Find.pm is also wrong in 5.5: uses a non-existent global variable. Fix when
  merging up.
2011-04-14 16:17:58 +02:00
Bjorn Munch
255986a511 Bug #12360501 MTR --GCOV DOES NOT WORK WITH CMAKE BUILDS
Changed to use $bindir instead of $basedir
Simplified search for files: find all *.gcno
Also, .msg and .err files had been mixed up
2011-04-14 14:25:15 +02:00
Serge Kozlov
b655b931be autocommit 5.1 -> 5.5 2011-04-14 15:54:48 +04:00
Serge Kozlov
7634e724e7 WL#5867, postfix for binlog_bug23533 2011-04-14 15:24:11 +04:00
Sergey Glukhov
bd94bb5dd9 automerge 2011-04-14 13:34:53 +04:00
Sergey Glukhov
aaecb54982 5.1 -> 5.5 merge 2011-04-14 13:10:11 +04:00
Jon Olav Hauglid
a5986fa220 Bug#12352846 - TRANS_XA_START(THD*):
ASSERTION THD->TRANSACTION.XID_STATE.XID.IS_NULL()
               FAILED

The triggered assert checks that the previous XA transaction has
done proper cleanup before a new XA transaction is started.
The bug that caused it to be triggered was that XA COMMIT did not
clean up error state if XA COMMIT discovered that the current XA
transaction had to be rolled back.

This patch fixes the problem by resetting the XA error state
before XA COMMIT calls ha_rollback_trans(). This allows following
XA transactions to be started without triggering the assert.

Test case added to xa.test.
2011-04-14 10:13:28 +02:00