Commit graph

68131 commits

Author SHA1 Message Date
Mattias Jonsson
b7b33fd9d6 merge 2010-12-14 13:10:19 +01:00
Sergey Glukhov
e6bf102466 5.1-bugteam->5.5-bugteam merge 2010-12-14 13:46:00 +03:00
Tor Didriksen
8d311a8551 Automerge 5.1-bugteam => 5.5-bugteam 2010-12-13 17:13:31 +01:00
Sergey Glukhov
e52e64ac35 5.1-bugteam->5.5-bugteam merge 2010-12-13 15:11:16 +03:00
Tor Didriksen
0611bf2203 Bug #58426 Crashing tests not failing as they are supposed to on Solaris 10 debug
On this platform we seem to get lots of other signals
while waiting for SIGKILL to be delivered.

Solution: use sigsuspend(<all signals blocked>)



dbug/dbug.c:
  New function _db_suicide_() which does kill(myself, -9) and then waits forever.
include/my_dbug.h:
  Let DBUG_SUICE wait forever until the KILL signal is delivered, and process dies.
2010-12-13 12:19:30 +01:00
Sergey Glukhov
8394b6a271 5.1-bugteam->5.5-bugteam merge 2010-12-13 13:48:16 +03:00
Georgi Kodinov
352ce1b596 Bug #57954: BIT_AND function returns incorrect results
when semijoin=on

When setting the aggregate function as having no rows to report
the function no_rows_in_result() was calling Item_sum::reset().
However this function in addition to cleaning up the aggregate 
value by calling aggregator_clear() was also adding the current
value to the aggregate value by calling aggregator_add().
Fixed by making no_rows_in_result() to call aggregator_clear()
directly.
Renamed Item_sum::reset to Item_sum::reset_and_add() to
and added a comment to avoid misinterpretation of what the
function does.
2010-12-08 14:28:06 +02:00
Sergey Vojtovich
9588e1ba53 Merge fix for BUG58205 to 5.5-bugteam. 2010-12-08 15:10:11 +03:00
Marc Alff
899038030a Bug#58798 SHOW ENGINE PERFORMANCE_SCHEMA STATUS: incorrect table lettercase
Before this fix, the output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS
used uppercase to name performance schema tables.

This is inconsistent since performance schema tables have been renamed to lowercase.

Also, an old table 'PROCESSLIST' was still visible, 
even after this table got renamed to 'threads'.

This fix:
- correctly uses lowercases in the output, to match the current naming.
- replaced 'PROCESSLIST' with 'threads'.

Tested the output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS manually.
No automated test cases can be written for this, 
since the output is too platform dependent (sizes).
2010-12-07 21:00:33 +01:00
Ramil Kalimullin
7e4961bd51 Fix for bug #58669: read_only not enforced on 5.5.x
merged from mysql-5.5.8-release tree,
revision: ramil@mysql.com-20101203174908-217tdkn150vieha9
2010-12-07 20:08:54 +03:00
Luis Soares
16b2ca1f65 BUG#46166
Post merge fixes for mysql-5.5-bugteam.
2010-12-07 16:55:25 +00:00
Guilhem Bichot
6bad2a2a44 merge from latest 5.5-bugteam 2010-12-07 17:18:52 +01:00
Luis Soares
26ee8f532e BUG#46166
Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.

Conflicts
=========

Text conflict in sql/log.cc
Text conflict in sql/log.h
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_priv.h
2010-12-07 16:11:13 +00:00
Guilhem Bichot
39b0af1e8c Fix for Bug#57932 "query with avg returns incorrect results":
when there was one NULL value, AVG(DISTINCT) could forget about other values.
See commit comment of item_sum.cc.

mysql-test/r/func_group.result:
  before the code fix, both SELECTs would return NULL
sql/item_sum.cc:
  Assume we are executing "SELECT AVG([DISTINCT] some_field) FROM some_table".
  and some_field is the single field of some_table for simplicity.
  Each time a row is processed (evaluate_join_record()->
  end_send_group()->update_sum_func()) an aggregator is notified,
  which itself notifies an Item_sum_avg.
  Without DISTINCT, this Item_sum_avg immediately increments its
  internal "sum of values" and "count of values" (the latter being
  Item_sum_avg::count). The count is incremented only if the row's value
  is not NULL (in Item_sum_avg::add()), per AVG() semantices. This row's value
  is available in args[0] of Item_sum_avg ("args[0]" stands for
  "the first argument of the item": it's an Item_field which automatically
  receives the row's value when a row is read from the table).
  bool Item_sum_avg::add()
  {
    if (Item_sum_sum::add()) << calculates the sum (ignores NULL)
      return TRUE;
    if (!args[0]->null_value)<<if added value is not NULL
      count++;       <<increment "count"
    return FALSE;
  }
  and everything works.
  With DISTINCT, when a row is processed by evaluate_join_record(),
  Item_sum_avg does no immediate computation, rather stores
  the row's value in a tree (to throw the value away if it is a duplicate
  of previous value, otherwise to remember all
  distinct values). It's only when it's time to send the average to the
  user (at end of the query:
  sub_select(end_of_records=true)->end_send_group()->
  select_send->send_data()->Protocol::send_result_set_row()->
  Item::send()->Item_sum_avg->val_str()), that we iterate over the tree,
  compute the sum and count: for this, for each element of the tree,
  Item_sum_avg::add() is called and has the same two steps as before:
  * Item_sum_sum::add() updates the sum (finding the tree element's value
  correctly, and determining correctly its NULLness - look for "arg_is_null"
  in that function)
  * the "if (!args[0]->null_value)" test right after, breaks: it uses args[0],
  which isn't the tree's element but rather the value for the last row
  processed by evaluate_join_record(). So if that last row was NULL,
  "count" stays 0 for each row, and AVG() then returns NULL (count==0 =>
  NULL, per AVG() semantics).
  The fix is to let the aggregator tell whether the value
  it just saw was NULL. The aggregator knows where to get the info
  thanks to virtual functions. Item_sum_sum::add() now asks
  the aggregator. Item_sum_avg() also asks the aggregator
  and then knows it shouldn't increment "count".
sql/item_sum.h:
  Aggregator can now tell about value/NULLness of just-aggregated value
2010-12-07 16:59:32 +01: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
Nirbhay Choubey
b2fde131dc Additional fix in the test for Bug#58139. 2010-12-07 21:14:07 +05:30
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
Luis Soares
209df6a69f BUG#58416
Null merge to from mysql-5.1-bugteam to mysql-5.5-bugteam.
Test case does not exist in 5.5 tree.
2010-12-07 14:31:00 +00: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
Marc Alff
7f67060ef2 Valgrind 3.5.0 cleanup, continued 2010-12-07 15:13:27 +01:00
Marc Alff
2f228bd1f5 Valgrind 3.5.0 cleanup 2010-12-07 14:52:14 +01:00
Nirbhay Choubey
e3922b8b91 Bug#58139 : default-auth option not recognized in MySQL standard
command line clients.

Command line tools like mysqladmin and mysqldump did not recognize
default-auth and plugin-dir options.

Support for these options was found missing in these command line
tools.

Fixed by adding support for the same.


client/mysqladmin.cc:
  Bug#58139 : default-auth option not recognized in MySQL standard
              command line clients.
  
  Introduced two new variables to hold values from default-auth and
  plugin-dir options and further pushed them to client's st_mysql
  instance.
client/mysqldump.c:
  Bug#58139 : default-auth option not recognized in MySQL standard
              command line clients.
  
  Introduced two new variables to hold values from default-auth and
  plugin-dir options and further pushed them to client's st_mysql
  instance.
mysql-test/r/plugin_auth.result:
  Added test case for Bug#58139.
mysql-test/t/plugin_auth.test:
  Added test case for Bug#58139.
2010-12-07 17:37:07 +05:30
Jonathan Perkin
5046dc160b bug#58766: Server binary was compiled without fast-mutexes
Re-enable fast mutexes on Linux for release builds.
2010-12-07 11:40:38 +00:00
Alfranio Correia
1ce79dcfdd Post-push fix for BUG#57275. 2010-12-06 11:55:36 +00:00
Alfranio Correia
c8b24adad5 merge mysql-5.5-bugteam(local) --> mysql-5.5-bugteam 2010-12-05 22:01:44 +00:00
Vasil Dimov
ee12afc0bd Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty) 2010-12-05 21:17:51 +02:00
Vasil Dimov
7a8ca24d31 Merge mysql-5.5-bugteam -> mysql-5.5-innodb 2010-12-05 21:17:01 +02:00
Vasil Dimov
70bcb65bb6 Merge mysql-5.1-bugteam -> mysql-5.1-innodb 2010-12-05 21:16:13 +02:00
Ramil Kalimullin
cf175bf4b8 Fix for bug #58669: read_only not enforced on 5.5.x
Problem: "read-only" option ignored if it's enabled in
the command line (or in the config file).

Fix: sync opt_readonly (which is used for checks) with 
read_only (global var) when all server options are handled.


mysql-test/r/bug58669.result:
  Fix for bug #58669: read_only not enforced on 5.5.x
    - test result.
mysql-test/t/bug58669-master.opt:
  Fix for bug #58669: read_only not enforced on 5.5.x
    - test case.
mysql-test/t/bug58669.test:
  Fix for bug #58669: read_only not enforced on 5.5.x
    - test case.
sql/mysqld.cc:
  Fix for bug #58669: read_only not enforced on 5.5.x
    - sync opt_readonly boolean with read_only boolean
  in the get_options().
sql/mysqld.h:
  Fix for bug #58669: read_only not enforced on 5.5.x
    - sync opt_readonly boolean with read_only boolean
  in the get_options().
sql/sys_vars.cc:
  Fix for bug #58669: read_only not enforced on 5.5.x
    - sync opt_readonly boolean with read_only boolean
  in the get_options().
2010-12-03 20:49:08 +03: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
Jonathan Perkin
1699e62452 Add --parallel=auto to collection files which don't currently have it. 2010-12-03 14:43:49 +00:00
Mattias Jonsson
2551963711 post-push fix for test to work on row-based-replication 2010-12-03 14:05:33 +01:00
Mattias Jonsson
a998586d45 merge of bug#58147, including rename of the new argument,
to_binlog -> binlog_stmt.
2010-12-03 10:33:29 +01:00
Vasil Dimov
efcaa1ef7f Cherry pick vasil.dimov@oracle.com-20101201140708-fsc5xlu9bkpov6pv
from mysql-trunk-innodb. The same problem also exists in 5.5.

  X revision-id: vasil.dimov@oracle.com-20101201140708-fsc5xlu9bkpov6pv
  X committer: Vasil Dimov <vasil.dimov@oracle.com>
  X branch nick: mysql-trunk-innodb
  X timestamp: Wed 2010-12-01 16:07:08 +0200
  X message:
  X   Fix Bug#58432 innodb.innodb_bug56143 fails under valgrind
  X   
  X   Use a longer timeout for semaphore waits if (possibly) running under
  X   Valgrind.
  X   
  X   Approved by:	Marko (via IRC)
2010-12-03 09:35:53 +02:00
Alfranio Correia
b28d2c25a7 merge mysql-5.5-bugteam(local) --> mysql-5.5-bugteam 2010-12-03 01:06:56 +00:00
Vasil Dimov
8903bae21a Define MYSQL_(MAJOR|MINOR)_VERSION the way things are defined in CMake
instead of hacking a custom ADD_DEFINITIONS().

Approved by:	Kent Boortz (via IRC)
2010-12-02 12:04:10 +02:00
Marko Mäkelä
60fd9a180c Merge from mysql-5.5-innodb to local. 2010-12-02 10:55:27 +02:00
Mats Kindahl
3ffab56619 Merging with mysql-5.5-bugteam. 2010-12-02 09:55:08 +01:00
Vasil Dimov
691bf28a56 Use "rep; nop" in InnoDB if it is available and "pause" is not 2010-12-02 10:36:45 +02:00
Marko Mäkelä
789425e0b4 Fix UNIV_MEM_DEBUG compilation failure caused by Bug#58226 fix.
To fix Bug#58226 (speed up UNIV_DEBUG), among other things we no longer
disable the inlining of the functions that are defined in InnoDB .ic files.
Inside UNIV_MEM_DEBUG, there was an implicit type conversion from void*
that is all right in C, but not in C++. Now that inlining was enabled,
the C++ compiler would see the code and complain.

Approved by Jimmy Yang on IRC.
2010-12-02 10:32:27 +02:00
Mats Kindahl
8c937b86b2 Bug #58246: INSTALL PLUGIN not secure & crashable
Adding symbol FN_DIRSEP to Windows as well.
2010-12-02 09:18:47 +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
e7c62beba7 merge from 5.1-bugteam 2010-12-02 08:16:26 +01:00
Tor Didriksen
d56a6dd027 BUG#58246 post-push fix broken DBG build. 2010-12-02 08:14:43 +01:00
Mats Kindahl
65faf729cd Merging patch for BUG#58246 into mysql-5.5-bugteam. 2010-12-01 23:15:14 +01:00
Mattias Jonsson
2737a72278 Bug#58147: ALTER TABLE w/ TRUNCATE PARTITION fails
but the statement is written to binlog

TRUNCATE PARTITION was written to the binlog
even if it failed before calling any partition's
truncate function.

Solved by adding an argument to truncate_partition,
to flag if it should be written to the binlog or not.

It should be written to the binlog when a call to any
partitions truncate function is done.

mysql-test/r/partition_binlog.result:
  New result file
mysql-test/t/partition_binlog.test:
  New test file, including DROP PARTITION binlog test
sql/ha_partition.cc:
  Added argument to avoid binlogging failed truncate_partition that
  have not yet changed any data.
sql/ha_partition.h:
  Added argument to avoid excessive binlogging
sql/sql_partition_admin.cc:
  Avoid to binlog TRUNCATE PARTITION if it fails before
  any partition has tried to truncate.
2010-12-01 22:47:40 +01:00
Mats Kindahl
9c87ae9ba7 Merging patch for BUG#58246 with mysql-5.1-bugteam. 2010-12-01 20:33:31 +01:00
Marc Alff
c2a655f02d Local merge 2010-12-01 19:07:57 +01:00