1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Commit Graph

67365 Commits

Author SHA1 Message Date
unknown
4337aa74e3 MWL#180: Fix bug where setting @@global.binlog_checksum did not actually change the value. 2011-05-05 16:32:20 +02:00
unknown
ee3b7b56e4 Fix LP BUG#772309
Analysis:
The method st_select_lex::optimize_unflattened_subqueries()
incorrectly propagated to each subquery the complete
select_options flag set for the whole query. Among other
flags in select_options, this propagated incorrectly the
STRAIGHT_JOIN flag from the upper query to the subquery.

Solution:
During EXPLAIN set only the SELECT_DESCRIBE bit in the
select_options of the subquery.
2011-05-05 15:24:28 +03:00
Michael Widenius
d5caa00161 Improved 'make test-unit' time slightly
storage/maria/unittest/ma_test_loghandler-t.c:
  Don't sync during test
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
  Don't sync during test
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
  Don't sync during test
unittest/mysys/bitmap-t.c:
  Don't test all bit combinations (not needed)
unittest/mysys/thr_template.c:
  Remove sleep as old bug should be fixed nowadays
unittest/mysys/waiting_threads-t.c:
  Only run test with --big
unittest/mytap/tap.c:
  Print total time at end of test.
unittest/unit.pl:
  Use TAP::Harness instead of Test::Harness (recommended according to manual)
  Add times to tests.
2011-05-05 14:51:01 +03:00
Igor Babaev
20c9084deb Fixed LP bug #776295.
If the value of the flag cond_false of an Item_equal object is
true then the print method must return the string '0'.
2011-05-04 18:08:44 -07:00
unknown
f48784754a MWL#89
Adjusted test results after merge.
2011-05-05 01:35:03 +03:00
unknown
879f25dc64 MWL#89
Merge with main 5.3
2011-05-05 00:35:21 +03:00
Michael Widenius
4249382a65 Automatic merge 2011-05-04 22:33:18 +03:00
Michael Widenius
718ddbb2ca Automatic merge with 5.1 2011-05-04 22:25:56 +03:00
Michael Widenius
a67a5dd6f9 Automatic merge 2011-05-04 21:56:29 +03:00
Michael Widenius
a3af6f0f3d Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets
Fixed compiler warnings

client/readline.cc:
  Fixed compiler warning
mysql-test/suite/innodb/t/innodb_bug60049.test:
  This test failed when running with --mysqld=--loose-innodb-fast-shutdown=2 which we do on some machines
mysql-test/t/mysqldump.test:
  Only run test if utf8 is used
sql/log.cc:
  Fixed compiler warning
sql/mysql_priv.h:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Don't abort test if ucs2 is not in use.
2011-05-04 21:51:44 +03:00
Michael Widenius
3c9ae014ca Fixed build errors on centos5-amd64-minimal, where we compile with very few character sets
Fixed compiler warnings

client/readline.cc:
  Fixed compiler warning
mysql-test/t/mysqldump.test:
  Only run test if utf8 is used
sql/log.cc:
  Fixed compiler warning
sql/mysql_priv.h:
  Fixed compiler warnings
tests/mysql_client_test.c:
  Don't abort test if ucs2 is not in use.
2011-05-04 21:28:02 +03:00
Igor Babaev
e3e2358fd2 Fixed LP bug #751350.
The third parameter in the call of make_cond_for_table() that
built the pushed condition containing only outer references
was incorrect. This condition appeared for the first time in
the patch fixing bug 729039.
2011-05-04 11:23:29 -07:00
Vladislav Vaintroub
10438588a3 merge 2011-05-04 17:11:54 +02:00
Oleksandr Byelkin
7b797fe66d Moving max/min optimization from prepare to optimization phase. MWL#148
mysql-test/r/explain.result:
  fixed results (new item)
mysql-test/r/subselect.result:
  fixed results (new item)
mysql-test/r/subselect_no_mat.result:
  fixed results (new item)
mysql-test/r/subselect_no_opts.result:
  fixed results (new item)
mysql-test/r/subselect_no_semijoin.result:
  Fixed results (new item)
mysql-test/suite/pbxt/r/subselect.result:
  Fixed results (new item)
mysql-test/t/explain.test:
  Fixed results (correct behaviour)
sql/item_cmpfunc.cc:
  Pass through  for max/min
sql/item_subselect.cc:
  moving max/min
sql/item_subselect.h:
  moving max/min
sql/mysql_priv.h:
  new uncacheble flags added
sql/opt_subselect.cc:
  maxmin moved.
sql/opt_subselect.h:
  New function for maxmin.
sql/sql_class.h:
  debug code
sql/sql_lex.cc:
  Fixed flags.
  Limit setting fixed.
sql/sql_lex.h:
  2 new flags.
sql/sql_select.cc:
  Prepare divided on 2 function to be able recollect some info after transformation.
sql/sql_select.h:
  Prepare divided on 2 functions.
2011-05-04 18:08:58 +03:00
Vladislav Vaintroub
ca67f01bae merge 2011-05-04 16:12:39 +02:00
Vladislav Vaintroub
aff371f662 Cherrypick fix for maria recovery bug LPBUG#686006 from 5.2
into 5.1
2011-05-04 16:03:52 +02:00
Vladislav Vaintroub
c34e5a9152 Avoid mtr warning on Windows during startup
The reason for mtr warning is that collect_mysqld_features() starts mysqld with --datadir=/tmp and this 
directory does not exist on Windows.

Fix : instead of passing --datadir=$opt_vardir/tmp in collect_mysqld_features() just use --datadir=.
mysqld does not need a correct directory, just an existing one, as it is started with --help ---verbose -skip-grant-tables.
2011-05-04 15:45:39 +02:00
unknown
32d88236f2 MWL#180: merge fixes from 5.2-rpl + forgot to adjust revision from which checksums are supported when merging into 5.3-based tree. 2011-05-04 15:44:29 +02:00
unknown
7a36035bd2 MWL#180 Buildbot fixes:
- Fix windows CMake build.
 - Merge some later test case fixes, to see if they solve the random rpl_checksum failure.
2011-05-04 15:41:05 +02:00
Vladislav Vaintroub
e4732a765e fix noisy warnings in header files 2011-05-04 14:47:27 +02:00
unknown
0278b06e6b LP BUG#715759
Pushing test case only. The bug itself was fixed by the
combined patches for LP BUG#717577 and LP BUG#776274.
2011-05-04 13:53:43 +03:00
Michael Widenius
7191a44b4c Automatic merge 2011-05-04 12:04:13 +03:00
unknown
c7f0fd6592 Automatic merge with 5.3 2011-05-04 12:00:18 +03:00
Michael Widenius
a9d14f5134 Automatic merge 2011-05-04 11:59:16 +03:00
Michael Widenius
52e4fce886 Automatic merge with 5.1 2011-05-04 11:35:51 +03:00
Michael Widenius
173820a553 Fixed typo that caused compiler warning 2011-05-04 11:31:06 +03:00
Michael Widenius
d2472af7f5 Fixed compiler warning 2011-05-04 11:28:02 +03:00
Igor Babaev
aaf9fb0de7 Fixed LP bug #776274,
The bug was introduced by the patch that fixed bug 717577.
2011-05-03 17:11:45 -07:00
Vladislav Vaintroub
a9dd346c9b merge 2011-05-03 19:36:06 +02:00
Vladislav Vaintroub
713c86c079 merge 2011-05-03 19:32:17 +02:00
Vladislav Vaintroub
7d8a918c64 Fix warning (unused local variable) 2011-05-03 19:30:21 +02:00
Michael Widenius
547ef66609 Automatic merge with MariaDB 5.1 2011-05-03 19:11:39 +03:00
Michael Widenius
1be5462d59 Merge with MariaDB 5.1 2011-05-03 19:10:10 +03:00
Michael Widenius
f74853053f Automatic merge 2011-05-03 18:27:14 +03:00
Michael Widenius
96c1a87455 Fixed after-merge failures found by buildbot
mysql-test/suite/funcs_1/r/is_columns_is.result:
  Updated test results
mysql-test/suite/pbxt/r/client_xml.result:
  Updated test results
mysys/Makefile.am:
  Added back my_port.c
storage/xtradb/buf/buf0buddy.c:
  Removed not used variables
storage/xtradb/fil/fil0fil.c:
  Added casts to fix compiler warnings
2011-05-03 18:17:13 +03:00
unknown
284f52476c Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. 2011-05-03 14:44:25 +02:00
unknown
014b8e7f43 Backport MySQL WL#2540 into MariaDB.
Patch backported:

bzr diff
'-rrevid:alfranio.correia@oracle.com-20101121143257-se3vpqus73l4mum0
..revid:luis.soares@oracle.com-20101124111752-9b8260bd1qak87hr'
--old=lp:mysql-server --new=lp:mysql-server
2011-05-03 14:01:11 +02:00
Vladislav Vaintroub
b46f14352b Fix Xtradb compile error on Win64 - conversion between pointers of different size 2011-05-03 12:50:09 +02:00
Vladislav Vaintroub
e6926b06da Fix compile errors:
- from xtradb merge
- portability error in bitmap-t.c ( variable size  array in non-portable)
2011-05-02 23:03:26 +02:00
unknown
5dc11616b2 MWL#89
Merge with 5.3
2011-05-02 21:59:16 +03:00
Michael Widenius
90e058e0c6 Automatic merge 2011-05-02 21:42:52 +03:00
Michael Widenius
ee1950dab1 Merge with xtradb fixes 2011-05-02 21:41:02 +03:00
Michael Widenius
e415ba0fb2 Merge with MySQL 5.1.57/58
Moved some BSD string functions from Unireg
2011-05-02 20:58:45 +03:00
Vladislav Vaintroub
8ac88c88f0 Shoot in the dark - try to fight build environment based on cygwin, where
presumably neither TMP nor TEMP environment variable are set.
2011-05-02 13:02:36 +02:00
Michael Widenius
35352d4da6 mysql-test/suite/funcs_1/r/storedproc.result:
Fixed test failure
mysql-test/suite/funcs_1/t/storedproc.test:
  Fixed test failure
  (The error changed as syntax for alter changed with ALTER ONLINE)
storage/maria/ha_maria.cc:
  fixed compiler warning
2011-05-02 13:25:53 +03:00
Sergey Petrunya
ea43df7685 - Release build: Fix compiler warning about unused variable
- Debug build: make DBUG_ASSERT statements really look at the first table

One can't expect cursors to work with semi-join subqueries anyway, 
though (which isn't a problem because cursors are not used anywhere)
2011-04-30 12:28:27 +02:00
Sergey Petrunya
65b9fb5a13 Update test results 2011-04-30 08:29:52 +02:00
Igor Babaev
80b0b300f6 Merge 2011-04-29 19:20:46 -07:00
Sergey Petrunya
3098c21b8f Merge MWL#90 into 5.3-main 2011-04-30 04:59:05 +04:00
unknown
8b046db411 Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1. 2011-04-29 16:16:42 +02:00