1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Commit Graph

68513 Commits

Author SHA1 Message Date
John H. Embretsen
1e921bb292 Merge fix for bug 59837 from mysql-5.1 to mysql-5.5. 2011-02-08 10:53:02 +01:00
Anitha Gopi
ef2eb87b6b Added more tests to daily 2011-02-08 13:20:32 +05:30
Anitha Gopi
9aea015d30 Null merge from 5.1 2011-02-08 12:19:33 +05:30
Anitha Gopi
13292b3775 Remove unwanted collections 2011-02-08 11:47:57 +05:30
Anitha Gopi
4e24741e0f Upmerge 3565 from 5.1 2011-02-08 11:41:57 +05:30
Vasil Dimov
6eb014a606 Adjust a suppression to cover more codepaths. 2011-02-08 07:53:37 +02:00
Anitha Gopi
21b847c752 Bug#52208 - Removed main.gis from experimental group 2011-02-08 08:56:49 +05:30
Inaam Rana
62ec6970d9 Bug #59472 increase AIO requests per IO thread limit to 256 from 32
rb://566
approved by: Sunny

When using native aio on linux each IO helper thread should be able to
handle upto 256 IO requests. The number 256 is the same which is used
for simulated aio as well. In case of windows where we also use native
aio this limit is 32 because of OS constraints. It seems that we are
using the limit of 32 for all the platforms where we are using native
aio. The fix is to use 256 on all platforms except windows (when native
aio is enabled on windows)
2011-02-07 18:43:00 -05:00
Bjorn Munch
adc2e5df19 null upmerge 2011-02-08 00:28:32 +01:00
Bjorn Munch
f2fb2a0bcf merge 47141,59979 2011-02-08 00:27:30 +01:00
Vasil Dimov
cbeb1299c7 Add one more Valgrind suppression to cover a different codepath 2011-02-07 19:54:09 +02:00
Vasil Dimov
99c7f81e02 Null merge mysql-5.1-innodb -> mysql-5.5-innodb
This change was backported from 5.5.
2011-02-07 16:47:39 +02:00
Bjorn Munch
ff8d8984a4 upmerged and adapted 59979 2011-02-07 12:55:34 +01:00
Tor Didriksen
410cb8dfc5 Bug #59632 Assertion failed: arg_length > length
The problem was overflow in max_length when we tried to des_decrypt()
something which is not the output of des_encrypt()
2011-02-07 11:17:46 +01:00
Ole John Aske
d7e3a54271 Merge of fix for bug#59308 from mysql-5.1 -> mysql-5.5 2011-02-07 10:40:42 +01:00
Vasil Dimov
5c14b7e103 Merge mysql-5.1-innodb -> mysql-5.5-innodb 2011-02-07 11:18:59 +02:00
Vinay Fisrekar
4f3a61edf3 bzr merger from mysql-5.1 to mysql-5.5
Bug#59955 - engines/funcs/ps_string_not_null test needs better cleanup
2011-02-07 12:34:43 +05:30
Dmitry Shulga
792073a36a Auto-merge from mysql-5.1 for bug#57450. 2011-02-05 11:04:15 +06:00
Serge Kozlov
7e34d8c343 Bug#43828, Bug#59494.
After introducing new way of initialization of replication the setting different heartbeat periods for slaves was missed.
Added asserts
2011-02-04 22:07:48 +03:00
Vasil Dimov
9bc782a3f5 Fix Bug#59875 Valgrind warning in buf0buddy.c
Suppress a bogus valgrind warning.
2011-02-04 19:43:34 +02:00
Vasil Dimov
907266d9b3 Merge mysql-5.1-innodb -> mysql-5.5-innodb 2011-02-04 18:30:05 +02:00
Marc Alff
e6f39a9a24 Bug#58740 Valgrind warning in PFS (pfs_setup_actor.cc)
Valgrind gets confused by the call stack generated with optimized
builds, with inlined functions.
Reduced the stack context for the suppression in lf_pinbox_get_pins.
2011-02-04 08:26:30 -07:00
kevin.lewis@oracle.com
c8ac9f10c1 Bug#59699 - Hidden bug would cause a crash for unknown tablespace flags.
The bug would cause a crash of InnoDB if a non-standard or unknown table
flags existed in a SYS_TABLES record. This is important because the next
file version, Cheetah, will identify itself by expanding this field.  So
unless this is fixed, an older engine that tries to open a table in a
tablespace with a newer file version will crash instead of report an error
and refuse to open the table, as it should do.

Reviewed at RB://583.    Approved by Marko.
2011-02-04 08:59:30 -06:00
Luis Soares
fb48726bdd BUG#59147: automerge mysql-5.1 into mysql-5.5. 2011-02-04 14:59:04 +00:00
Bjorn Munch
c71b7afe42 upmerge 47141 2011-02-04 13:20:12 +01:00
Bjorn Munch
8196bfa32e merge from 5.5 main 2011-02-04 12:39:35 +01:00
Dmitry Shulga
d284940f8b Merge from mysql-5.1 for bug#58026. 2011-02-04 10:59:55 +06:00
Georgi Kodinov
5ba1fe9749 merge 2011-02-02 20:16:06 +02:00
Georgi Kodinov
3b65062d33 merge 2011-02-02 20:13:28 +02:00
Dmitry Lenev
9b3884e9d7 Merged fix for bug #58650 "Failing assertion:
primary_key_no == -1 || primary_key_no == 0"
with recent changes from mysql-5.5 tree.
2011-02-02 16:58:13 +03:00
Marko Mäkelä
1129d230f7 Merge mysql-5.1-innodb to mysql-5.5-innodb. 2011-02-02 15:58:01 +02:00
Dmitry Lenev
3be9d7420e Merged fix for bug #58650 "Failing assertion:
primary_key_no == -1 || primary_key_no == 0"
into mysql-5.5 tree.
2011-02-02 16:53:56 +03:00
Tor Didriksen
207e5321bb Bug #36022 please log more information about "Sort aborted" queries
Write an additional warning message to the server log, 
explaining why a sort operation is aborted.

The output in mysqld.err will look something like:
110127 15:07:54 [ERROR] mysqld: Sort aborted: Out of memory (Needed 24 bytes)
110127 15:07:54 [ERROR] mysqld: Out of sort memory, consider increasing server sort buffer size
110127 15:07:54 [ERROR] mysqld: Sort aborted: Out of sort memory, consider increasing server sort buffer size
110127 15:07:54 [ERROR] mysqld: Sort aborted: Incorrect number of arguments for FUNCTION test.f1; expected 0, got 1

If --log-warn=2 is enabled, we output information about host/user/query as well.
2011-02-02 12:54:49 +01:00
Tor Didriksen
d6ed8398d5 Backport of fix for Bug#52123 2011-02-02 10:18:44 +01:00
Vasil Dimov
428063064f Replay a lost change (fix for Bug#56947 InnoDB leaks memory... in 5.5)
This change was originally done in
marko.makela@oracle.com-20101011085943-50pskvsbbsujbukg
but was later lost during the merge process.
2011-02-01 18:28:41 +02:00
Ole John Aske
1d6261c5c3 Fix for bug#58490, 'Incorrect result in multi level OUTER JOIN
in combination with IS NULL'
      
As this bug is a duplicate of bug#49322, it also includes test cases
covering this bugreport
      
Qualifying an OUTER JOIN with the condition 'WHERE <column> IS NULL',
where <column> is declared as 'NOT NULL' causes the
'not_exists_optimize' to be enabled by the optimizer.
      
In evaluate_join_record() the 'not_exists_optimize' caused
'NESTED_LOOP_NO_MORE_ROWS' to be returned immediately
when a matching row was found.
      
However, as the 'not_exists_optimize' is derived from
'JOIN_TAB::select_cond', the usual rules for condition guards
also applies for 'not_exist_optimize'. It is therefore incorrect
to check 'not_exists_optimize' without ensuring that all guards
protecting it is 'open'.
      
This fix uses the fact that 'not_exists_optimize' is derived from
a 'is_null' predicate term in 'tab->select_cond'. Furthermore,
'is_null' will evaluate to 'false' for any 'non-null' rows
once all guards protecting the is_null is open.
      
We can use this knowledge as an implicit guard check for the
'not_exists_optimize' by moving 'if (...not_exists_optimize)'
inside the handling of 'select_cond==false'. It will then
not take effect before its guards are open.
      
We also add an assert which requires that a
'not_exists_optimize' always comes together with
a select_cond. (containing 'is_null').
2011-02-01 15:19:34 +01:00
Ole John Aske
83817644c6 Merge 2011-02-01 13:23:28 +01:00
Georgi Kodinov
5599fef076 Bug #59657: Move the client authentication_pam plugin into the server repository
Created a clear text built in client authentication plugin.
Test case added.
Added a negative test case : a login failure.
2011-01-31 17:32:57 +02:00
Alfranio Correia
565d34539c null-merge 2011-01-31 14:34:04 +00:00
Alfranio Correia
cd4fd3c7c1 merge mysql-5.1 --> mysql-5.5
Conflicts:
  
  . mysql-test/extra/rpl_tests/rpl_insert_ignore.test
  . mysql-test/suite/rpl/t/disabled.def
  . mysql-test/suite/rpl/t/rpl_insert_ignore.test
  . sql/sql_insert.cc
  . sql/sql_repl.cc
2011-01-31 13:11:05 +00:00
Sandeep Doddaballapur
61163b51e0 2011-01-31 15:04:39 +05:30
Sandeep Doddaballapur
fe5d0856b9 upmerge for changes in mysql-5.1 - #33971 2011-01-31 14:33:26 +05:30
Marko Mäkelä
6268a3e437 Merge mysql-5.1-innodb to mysql-5.5-innodb. 2011-01-31 10:23:38 +02:00
Vasil Dimov
46dd8a175c Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty) 2011-01-30 19:17:31 +02:00
Vasil Dimov
61f531de08 Merge mysql-5.5 -> mysql-5.5-innodb 2011-01-30 19:16:38 +02:00
Vasil Dimov
5cb6293bff Merge mysql-5.1 -> mysql-5.5 (empty) 2011-01-30 18:53:43 +02:00
Vasil Dimov
102c39d344 Merge mysql-5.5-innodb -> mysql-5.5 2011-01-30 18:51:37 +02:00
Bjorn Munch
39655092eb merge 59148,59489 2011-01-30 12:09:33 +01:00
Bjorn Munch
33f1e8e4e7 null upmerge 2011-01-29 23:28:54 +01:00
Bjorn Munch
cebe69013a merge from 5.5 main 2011-01-29 22:53:17 +01:00