1
0
mirror of https://github.com/MariaDB/server.git synced 2025-06-01 19:42:01 +03:00

28265 Commits

Author SHA1 Message Date
Mats Kindahl
7c8d5d9bfc Merging with mysql-5.5. 2011-02-09 09:24:19 +01:00
Vasil Dimov
be01dbf587 Merge mysql-5.5-innodb -> mysql-5.5 2011-02-08 19:28:00 +02:00
Jonathan Perkin
5e1777f921 merge 2011-02-08 15:07:36 +01:00
Jonathan Perkin
f13788c9fd Merge from mysql-5.5.9-release 2011-02-08 14:59:03 +01:00
Anitha Gopi
63218454d5 Bug#59979: Added --debug-server option to collections 2011-02-08 17:25:42 +05:30
Mats Kindahl
3bea4a20a4 Bug #58455
Starting mysqld with defaults file without
extension cause segmentation fault

Bug occurs because fn_expand calls fn_format
with NULL as ext.

This is a backport of the patch from 5.6.

Patch solve this problem by using an empty
string as extension, and adding assertions
to fn_format that correct arguments are passed.

It also add a test tests several variations of
using non-existing defaults files.
2011-02-08 11:21:14 +01:00
John H. Embretsen
8805ecee53 Merge fix for bug 59837 from mysql-5.1 to mysql-5.5. 2011-02-08 10:53:02 +01:00
Anitha Gopi
37adcd8c40 Added more tests to daily 2011-02-08 13:20:32 +05:30
Anitha Gopi
22ed2f5d93 Remove unwanted collections 2011-02-08 11:47:57 +05:30
Anitha Gopi
3d5ef536e5 Upmerge 3565 from 5.1 2011-02-08 11:41:57 +05:30
Anitha Gopi
a5ed7f8621 Bug#52208 - Removed main.gis from experimental group 2011-02-08 08:56:49 +05:30
Bjorn Munch
76979f66d8 merge 47141,59979 2011-02-08 00:27:30 +01:00
Bjorn Munch
44c748414a upmerged and adapted 59979 2011-02-07 12:55:34 +01:00
Tor Didriksen
dcd9f246e3 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()


mysql-test/r/ssl_and_innodb.result:
  New test case.
mysql-test/t/ssl_and_innodb.test:
  New test case.
sql/item_strfunc.h:
  Do not subtract the encrypt overhead (9U) if args[0] has length < 9
  (In unsigned arithmetic, (1-9) becomes a very large number)
2011-02-07 11:17:46 +01:00
Ole John Aske
cee1b3dda8 Merge of fix for bug#59308 from mysql-5.1 -> mysql-5.5 2011-02-07 10:40:42 +01:00
Vinay Fisrekar
2f3fdbcfb8 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
d197051eac Auto-merge from mysql-5.1 for bug#57450. 2011-02-05 11:04:15 +06:00
Serge Kozlov
4c9cb95c2e 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
Marc Alff
15d0999462 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
Luis Soares
21bcb8e038 BUG#59147: automerge mysql-5.1 into mysql-5.5. 2011-02-04 14:59:04 +00:00
Bjorn Munch
e4b6b9da07 upmerge 47141 2011-02-04 13:20:12 +01:00
Dmitry Shulga
4e9e30434e Merge from mysql-5.1 for bug#58026. 2011-02-04 10:59:55 +06:00
Georgi Kodinov
9abc2aadc5 merge 2011-02-02 20:16:06 +02:00
Georgi Kodinov
fe145b0900 merge 2011-02-02 20:13:28 +02:00
Dmitry Lenev
d98270e1a3 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
Dmitry Lenev
5c3151e4ef 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
c711ce6726 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.


include/my_sys.h:
  Update comment for ME_NOREFRESH
mysql-test/include/mtr_warnings.sql:
  Remove global filtering of "Out of sort memory", let each individual test set it instead.
mysql-test/r/filesort_debug.result:
  New test case.
mysql-test/r/order_by.result:
  Ignore "Out of memory" for this test.
mysql-test/t/filesort_debug.test:
  New test case.
mysql-test/t/order_by.test:
  Ignore "Out of memory" for this test.
sql/filesort.cc:
  Output an explanation using the error message from the THD Diagnostics_area.
sql/protocol.cc:
  Do not DBUG_RETURN(function_call_with DBUG_RETURN)
  as it messes up the call stack in the debug output.
sql/share/errmsg-utf8.txt:
  Change error message for "Out of sort memory"
sql/unireg.h:
  Remove unused/confusing ERRMAPP macro.
2011-02-02 12:54:49 +01:00
Tor Didriksen
b503d77d5c Backport of fix for Bug#52123 2011-02-02 10:18:44 +01:00
Ole John Aske
ed74edada2 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
4b8888f6f0 Merge 2011-02-01 13:23:28 +01:00
Georgi Kodinov
193ced5652 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
318bdb6c66 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
29c2d1724d 2011-01-31 15:04:39 +05:30
Sandeep Doddaballapur
04ebd22553 upmerge for changes in mysql-5.1 - #33971 2011-01-31 14:33:26 +05:30
Evgeny Potemkin
8bd864b046 Auto-merged. 2011-01-12 20:32:38 +03:00
Georgi Kodinov
b0bbc00899 merge 2011-01-12 17:10:12 +02:00
Oystein Grovlen
17cd0bccdb Merge fix for Bug#59211 to mysql-5.5-security 2011-01-12 11:27:31 +01:00
Alfranio Correia
4de5140327 BUG#59267 LOAD DATA LOCAL INFILE not executed on slave with SBR
On windows, an #endif in a wrong place was causing an early
return from mysql_load and thus the LOAD DATA LOCAL was not
executed. This problem was fixed by moving the #endif to the
right place.

The following code was missing
    
  if ((stat_info.st_mode & S_IFIFO) == S_IFIFO)
    is_fifo = 1;

which is required to properly configure and read from the
IO_CACHE when a named pipe is used. So it was re-introduced
before the #endif.
2011-01-12 09:31:32 +00:00
Bjorn Munch
2a56b1b000 Bug #59216 mysql test suite can not run indiviual tests in engines/funcs suite
Test name spec would be cut at last /
Only do this when .test file name given, not suite.<test>
2011-01-11 15:16:29 +01:00
Bjorn Munch
8937cbd5ae upmerge 58896,58900,59002 2011-01-11 15:15:25 +01:00
Bjorn Munch
e2b73747df Bug #59002 Please make mtr print correct file and line number when tests fail
Followup: had forgotten to update mysqltest.test due to changed output - duh!
2011-01-11 15:00:21 +01:00
Bjorn Munch
83fea27b61 Bug #58841 Generalise handling of plugins in MTR mysql-test-run.pl script
Put descriptions of plugins into a separate file read by MTR
MTR itself has generalised code to read this and set env. variables
Removed the *SO variables, updated some tests accordingly
New commit: added optional list of plugin names for _LOAD variable
Also made changes for the new AUTH_* plugins
2011-01-11 14:27:03 +01:00
Bjorn Munch
5376a76dea Bug #58900 query_get_value crashes when result begins with dollar sign
Generalized fix for recursive backtick
Optional arg to eval_expr telling it not to interpret
2011-01-11 10:54:42 +01:00
Bjorn Munch
f3bc9f699c Bug #58896 MTR should recognise combinations as experimental without needing wildcards
Added a pattern match to cover combinations
Added to readme file
2011-01-11 10:53:22 +01:00
Anitha Gopi
5511a9d7ba Bug#47792 : Moving test out of disabled state since the problem is not seen anymore 2011-01-11 13:31:51 +05:30
Mattias Jonsson
fde3111498 merge 2011-01-10 17:02:54 +01:00
Mattias Jonsson
c574a9c414 Bug#57924: crash when creating partitioned table with
multiple columns in the partition key

ndb crash if duplicate columns in the partitioning key.

Backport from mysql-5.1-telco-7.0, see bug#53354.

Changed from case sensitive field name comparision
to non case sensitive too.

mysql-test/r/partition_error.result:
  updated result
mysql-test/t/partition_error.test:
  Added test for the error in non-ndb partitioned table.
sql/sql_partition.cc:
  Added check for duplicated field names in the
  partitioning key.
2011-01-10 16:20:28 +01:00
Mattias Jonsson
0df98f62c3 merge 2011-01-10 16:13:12 +01:00
Matthias Leich
32d3cc2596 The fix for Bug#58414 affecting the test show_check is pushed.
Remove the test from defaults.experimental.
2011-01-10 15:53:06 +01:00
Mattias Jonsson
b56308e63d Manual merge from 5.1 2011-01-10 15:08:31 +01:00