Commit graph

61427 commits

Author SHA1 Message Date
Alexander Nozdrin
c575b15a12 Manual merge from mysql-5.1.
Conflicts:
  - support-files/mysql.spec.sh
  - configure.in
2010-03-01 21:49:06 +03:00
Dmitry Lenev
9b705237b6 Merged recent changes from mysql-next-mr-bugfixing
into mysql-next-4284 tree.
2010-03-01 20:07:11 +03:00
Dmitry Lenev
5e09c42f21 Merged recent changes from mysql-next-mr-bugfixing
into mysql-next-4284.
2010-03-01 19:48:39 +03:00
Andrei Elkin
8f11b10c22 BUG#50296
restoring the maximum of slave_net_timeout as defined
#define LONG_TIMEOUT ((ulong) 3600L*24L*365L)
2010-03-01 18:48:34 +02:00
Roy Lyseng
b71eb4192c WL#5252: Deprecate --optimizer_search_depth=63
Add deprecation warning when variable optimizer_search_depth is given
the value 63.
      
  mysql-test/r/greedy_optimizer.result
    Updated with warning text.
  mysql-test/r/mysqld--help-notwin.result
    Updated with warning from mysqld --help --verbose.
  mysql-test/r/mysqld--help-win.result
    Updated with warning from mysqld --help --verbose.
  sql/sys_vars.cc
    Added an update check function to the constructor invocation for
    the optimizer_search_depth variable. The function emits a
    warning message for the value 63.
2010-03-01 17:31:02 +01:00
Dmitry Lenev
629be0947e Merge recent changes from mysql-next-mr-bugfixing
into mysql-next-4284 tree.
2010-03-01 18:13:57 +03:00
Marc Alff
de39f438e3 local merge before push to mysql-next-mr-bugfixing 2010-03-01 07:43:15 -07:00
Marc Alff
6d4cfbbca5 Bug#50296 Slave reconnects earlier than the prescribed slave_net_timeout value
Fixed failed assert on 64 bit platforms, introduced by the previous fix.

mysqld: sys_vars.h:125: Assertion `size == sizeof(T)' failed.
2010-03-01 07:30:22 -07:00
unknown
dec83dd282 Raise version number after cloning 5.1.45 2010-03-01 11:58:26 +01:00
Joerg Bruehe
a8c21d271f Spec file for RPMs:
Now that Oracle has legally acquired Sun, change the copyright owner
and the vendor.

support-files/mysql.spec.sh:
  Introduce a new macro "vendor 2" and set it to Sun,
  so that we can have a whole series of vendors if such events continue.
2010-03-01 11:42:44 +01:00
Alexander Nozdrin
d34ded9790 Auto-merge from mysql-trunk-merge. 2010-03-01 13:15:52 +03:00
Alexander Nozdrin
7c61806d9d Auto-merge from mysql-next-mr. 2010-03-01 13:14:34 +03:00
Alexander Nozdrin
128a2b865a Auto-merge from mysql-trunk. 2010-03-01 13:11:57 +03:00
Alexander Nozdrin
173125b1ec Disable partition_debug_sync temporarily awaiting a patch from Mattias. 2010-03-01 13:07:42 +03:00
Alexander Nozdrin
6d8f63e4a7 Add configure.am to .bzrignore. 2010-03-01 13:07:06 +03:00
Alexander Nozdrin
e0d1373a3b Manual merge from mysql-next-mr.
Conflicts:
  - sql/item.cc
2010-03-01 13:06:11 +03:00
Alexander Nozdrin
1bba800ace Auto-merge (empty) from mysql-trunk-merge. 2010-03-01 12:49:29 +03:00
Alexander Nozdrin
f572b3d35d Auto-merge (empty) from mysql-trunk. 2010-03-01 12:47:21 +03:00
Alexander Nozdrin
01f4a4c1bd Manual merge (empty) from mysql-trunk-merge.
Conflicts:
  - scripts/mysqld_multi.sh
  - sql/item_timefunc.cc
2010-03-01 12:45:36 +03:00
Alexander Nozdrin
aa6207d7dc Auto-merge (empty) from mysql-trunk-merge. 2010-03-01 12:41:28 +03:00
Alexander Nozdrin
5867d275a3 Manual merge from mysql-trunk-merge.
Conflicts:
  - sql/share/Makefile.am
2010-03-01 12:39:44 +03:00
Joerg Bruehe
72eae8a4cf Upmerge README change from "trunk" to "next-mr". 2010-03-01 10:27:30 +01:00
Joerg Bruehe
fa6d4d7c29 Update the README file for new contributed software,
as provided by Trudy Pelzer.
2010-03-01 10:19:39 +01:00
Alexander Nozdrin
43f5b7cdde Auto-merge from mysql-5.1. 2010-03-01 12:02:15 +03:00
Georgi Kodinov
3f484dbecf merge 2010-03-01 10:38:27 +02:00
Georgi Kodinov
e087424ebe merge 2010-03-01 10:37:38 +02:00
Georgi Kodinov
ebaa611a49 tree version change 2010-03-01 10:35:14 +02:00
Alexey Botchkov
b184d466ac merging. 2010-03-01 11:44:11 +04:00
Alexey Botchkov
a8d2da2336 Bug#42465 mysqlhotcopy fails with "Table '<y>' was locked with a READ lock" error message.
Since 5.5 FLUSH TABLES requires unlocked tables so the old LOCK TABLES/FLUSH TABLES
    model fails. Use atomic FLUSH TABLES WITH READ LOCK instead.

per-file comments:
  scripts/mysqlhotcopy.sh
Bug#42465      mysqlhotcopy fails with "Table '<y>' was locked with a READ lock" error message.
     Use FLUSH TABLES WITH READ LOCK instead of LOCK TABLES / FLUSH TABLES pair.
     Keep the old scheme for older servers.
2010-02-28 23:49:29 +04:00
Andrei Elkin
82fe344cbe merging to 6.0-codebase-bugfixing from a local branch 2010-02-28 19:47:16 +02:00
Andrei Elkin
055c61049e bug#50296
a small refinement to the test
2010-02-28 19:39:28 +02:00
Andrei Elkin
1faafbb047 Bug #50296 Slave reconnects earlier than the prescribed slave_net_timeout value
There was auto-reconnecting by slave earlier than a prescribed by slave_net_timeout value.
The issue happened on 64bit solaris that spotted rather incorrect casting of 
the ulong slave_net_timeout into the uint of mysql.options.read_timeout.

Notice, that there is no reason for slave_net_timeout to be of type of ulong.
Since it's primarily passed as arg to mysql_options the type can be made
as uint to avoid all conversion hassles.
That's what the fixes are made.
A "side" effect of the patch is a new value for the max of slave_net_timeout
to be the max of the unsigned int type (therefore to vary across platforms).

Note, a regression test can't be made to run reliably without making it to last over some 
20 secs. That's why it is placed in suite/large_tests.

mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result:
  the new test results.
mysql-test/suite/large_tests/t/rpl_slave_net_timeout-slave.opt:
  Initialization of the option that yields slave_net_timeout's default.
sql/mysql_priv.h:
  changing type for slave_net_timeout from ulong to uint
sql/mysqld.cc:
  changing type for slave_net_timeout from ulong to uint
sql/sys_vars.cc:
  Refining the max value for slave_net_timeout to be as the max for uint type.
2010-02-28 19:31:46 +02:00
Dmitry Lenev
6b5c4a9ef6 Fix for bug #51105 "MDL deadlock in rqg_mdl_stability test
on Windows".

On platforms where read-write lock implementation does not
prefer readers by default (Windows, Solaris) server might
have deadlocked while detecting MDL deadlock.

MDL deadlock detector relies on the fact that read-write
locks which are used in its implementation prefer readers
(see new comment for MDL_lock::m_rwlock for details).
So far MDL code assumed that default implementation of
read/write locks for the system has this property.
Indeed, this turned out ot be wrong, for example, for
Windows or Solaris. Thus MDL deadlock detector might have
deadlocked on these systems.

This fix simply adds portable implementation of read/write
lock which prefer readers and changes MDL code to use this
new type of synchronization primitive.

No test case is added as existing rqg_mdl_stability test can
serve as one.

config.h.cmake:
  Check for presence of pthread_rwlockattr_setkind_np to be
  able to determine if system natively supports read-write
  locks for which we can specify if readers or writers should
  be preferred.
configure.cmake:
  Check for presence of pthread_rwlockattr_setkind_np to be
  able to determine if system natively supports read-write
  locks for which we can specify if readers or writers should
  be preferred.
configure.in:
  Check for presence of pthread_rwlockattr_setkind_np to be
  able to determine if system natively supports read-write
  locks for which we can specify if readers or writers should
  be preferred.
include/my_pthread.h:
  Added support for portable read-write locks which prefer
  readers.
  To do so extended existing my_rw_lock_t implementation to
  support selection of whom to prefer depending on a flag.
mysys/thr_rwlock.c:
  Extended existing my_rw_lock_t implementation to support
  selection of whom to prefer depending on a flag.
  Added rw_pr_init() function implementing initialization of
  read-write locks preferring readers.
sql/mdl.cc:
  Use portable read-write locks which prefer readers instead of
  relying on that system implementation of read-write locks has
  this property (this was true for Linux/NPTL but was false,
  for example, for Windows and Solaris).
  Added comment explaining why preferring readers is important
  for MDL deadlock detector (thanks to Serg for example!).
sql/mdl.h:
  Use portable read-write locks which prefer readers instead of
  relying on that system implementation of read-write locks has
  this property (this was true for Linux/NPTL but was false,
  for example, for Windows and Solaris).
2010-02-28 07:35:09 +03:00
Konstantin Osipov
093106f552 WL#5000 FLUSH TABLES|TABLE table_list WITH READ LOCK.
Extend and implement the grammar that allows to FLUSH WITH READ LOCK
a list of tables, rather than all of them.

Incompatible grammar change:
Previously one could perform FLUSH TABLES, HOSTS, PRIVILEGES in a single
statement.
After this change, FLUSH TABLES must always be alone on the list.
Judging by the test suite, however, the old extended syntax
was never or very rarely used.

The new statement requires RELOAD ACL global privilege and
LOCK_TABLES_ACL | SELECT_ACL on individual tables.
In other words, it's an atomic combination of LOCK TALBES <list> READ
and FLUSH TABLES <list>, and requires respective privileges.

For additional information about the semantics, please
see WL#5000 and the comment for flush_tables_with_read_lock()
function in sql_parse.cc


mysql-test/r/flush.result:
  Update test results (WL#5000).
mysql-test/t/flush.test:
  Add test coverage for WL#5000.
sql/sql_yacc.yy:
  Allow FLUSH TABLES <table_list> WITH READ LOCK.
  Disallow FLUSH TABLES <table_list>, flush_options.
2010-02-27 20:05:14 +03:00
Vladislav Vaintroub
4761a651a1 merge 2010-02-27 17:21:50 +01:00
Alexander Barkov
7a83782f1c Mergine from mysql-next-me 2010-02-27 11:43:32 +04:00
Marc Alff
d6131618bb Bug#51447 performance schema evil twin files
Before this fix, the performance schema file instrumentation would treat:
- a relative path to a file
- an absolute path to the same file
as two different files.

This would lead to:
- separate aggregation counters
- file leaks when a file is removed.

With this fix, a relative and absolute path are resolved to the same file instrument.
2010-02-26 10:39:57 -07:00
Dmitry Lenev
88f4990c33 Merged recent changes from mysql-next-mr-bugfixing
into mysql-next-4284 tree.
2010-02-26 18:37:31 +03:00
Jonathan Perkin
33ecac14f7 Fix truncated GPL text. 2010-02-26 15:04:07 +00:00
Dmitry Lenev
aedf25be59 Merge recent changes from mysql-next-mr into
mysql-next-4284.
2010-02-26 17:24:43 +03:00
Georgi Kodinov
318c2dd90d merge 5.0-bugteam -> 5.1-bugteam 2010-02-26 15:16:46 +02:00
Georgi Kodinov
05ff7b65f0 merge 2010-02-26 15:10:25 +02:00
Alexey Kopytov
d583c459f7 Null merge of the InnoDB snapshot from mysql-5.1-bugteam
to mysql-trunk-merge.
2010-02-26 16:10:09 +03:00
Dmitry Lenev
cb7fe1347c Merged recent changes from mysql-next-mr-bugfixing into
mysql-next-4284 tree.
2010-02-26 16:06:33 +03:00
Alexey Kopytov
84766b060a Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
2010-02-26 16:06:31 +03:00
Georgi Kodinov
54639a1597 Bug #51468: mysqld_multi is broken in 5.1.44
Fixed a syntax error in mysqld_multi.sh
2010-02-26 14:49:13 +02:00
Jon Olav Hauglid
7fd30bf610 Bug #51240 ALTER TABLE of a locked MERGE table fails
The problem was that ALTER TABLE on a merge table which was locked 
using LOCK TABLE ... WRITE, by mistake gave 
ER_TABLE_NOT_LOCKED_FOR_WRITE.

During opening of the table to be ALTERed, open_table() tried to
get an upgradable metadata lock. In LOCK TABLEs mode, this lock
must already exist (i.e. taken by LOCK TABLE) as new locks of this
type cannot be acquired for fear of deadlock. So in LOCK TABLEs
mode, open_table() tried to find an existing upgradable lock for
the table to be altered.

The problem was that open_table() also tried to find upgradable
metadata locks for children of merge tables even if no such
locks are needed to execute ALTER TABLE on merge tables.

This patch fixes the problem by making sure that open tables code
only searches for upgradable metadata locks for the merge table
and not for the merge children tables. 

The patch also fixes a related bug where an upgradable metadata
lock was aquired outside of LOCK TABLEs mode even if the table in
question was temporary. This bug meant that LOCK TABLES or DDL on
temporary tables by mistake could be blocked/aborted by locks held
on base tables with the same table name by other connections.

Test cases added to merge.test and lock_multi.test.
2010-02-26 13:40:25 +01:00
Sergey Vojtovich
fe229e33f7 Merge innodb-5.1-ss6765 to 5.1-bugteam. 2010-02-26 16:34:13 +04:00
Sergey Glukhov
03561d35e3 automerge 2010-02-26 16:19:05 +04:00
Sergey Glukhov
9245ed4a12 Bug#50995 Having clause on subquery result produces incorrect results.
The problem is that cond->fix_fields(thd, 0) breaks
condition(cuts off 'having'). The reason of that is
that NULL valued Item pointer is present in the
middle of Item list and it breaks the Item processing
loop.


mysql-test/r/having.result:
  test case
mysql-test/t/having.test:
  test case
sql/item_cmpfunc.h:
  added ASSERT to make sure that we do not add NULL valued Item pointer
sql/sql_select.cc:
  skip adding an item to condition if Item pointer is NULL.
  skip adding a list to condition if this list is empty.
2010-02-26 15:39:25 +04:00