Commit graph

45541 commits

Author SHA1 Message Date
joerg@debian.(none)
94008df3e0 Merge debian.(none):/M51/mysql-5.1
into  debian.(none):/M51/push-5.1
2007-04-23 11:21:15 +02:00
mjorgensen@blade09.mysql.com
7855ae51f0 Merge bk-internal:/home/bk/mysql-5.1
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
2007-04-21 18:35:01 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
5004557953 test fixed for embedded server 2007-04-21 13:26:44 +05:00
holyfoot/hf@hfmain.(none)
381c72b80a Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-21 13:20:13 +05:00
ibabaev@bk-internal.mysql.com
c22d6fbb2b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-04-21 03:51:51 +02:00
igor@olga.mysql.com
8c85357ea3 Post-merge fix. 2007-04-20 17:47:14 -07:00
malff/marcsql@weblab.(none)
c574d95a5c manual merge 2007-04-20 17:49:07 -06:00
ibabaev@bk-internal.mysql.com
c09d1cfe92 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-04-21 00:36:21 +02:00
malff/marcsql@weblab.(none)
2d6d8e2abe Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-04-20 15:31:41 -06:00
evgen@moonbone.local
4434ff13a9 Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
2007-04-21 00:33:56 +04:00
tomas@whalegate.ndb.mysql.com
fc61036567 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-04-20 19:34:49 +02:00
joerg@trift2.
bcaa5cc7e8 mysql-test/t/sp_trans_log.test : Disable it in embedded (test fails). 2007-04-20 16:54:21 +02:00
mats@romeo.(none)
f4c4de6a56 Added missing result file for rpl_critical_errors. 2007-04-20 14:08:12 +02:00
mats@romeo.(none)
ae9744f266 Adding missing result file for rpl_critical_errors. 2007-04-20 14:03:15 +02:00
gshchepa/uchum@gshchepa.loc
6c5d17ef56 Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
2007-04-20 16:44:50 +05:00
gshchepa/uchum@gshchepa.loc
4fcf1316bb Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704
into  gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
2007-04-20 15:31:33 +05:00
joerg@debian.(none)
a9e05f8ce5 Merge debian.(none):/M50/push-5.0
into  debian.(none):/M51/push-5.1
2007-04-20 12:15:57 +02:00
gshchepa/uchum@gshchepa.loc
f5a229b3d1 Bug#27704: incorrect comparison of rows with NULL components
Support for NULL components was incomplete for row comparison,
fixed.  Added support for abort_on_null at compare_row() like
in 5.x
2007-04-20 15:14:09 +05:00
joerg@debian.(none)
4c00b6fd26 Merge debian.(none):/M51/mysql-5.1
into  debian.(none):/M51/push-5.1
2007-04-20 11:58:56 +02:00
joerg@debian.(none)
cd8359720e Merge debian.(none):/M50/bug27739-5.0
into  debian.(none):/M51/bug27739-5.1
2007-04-20 11:03:13 +02:00
gkodinov/kgeorge@magare.gmz
bcde01f6ff Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B27786-5.0-opt
2007-04-20 12:01:54 +03:00
mhansson@dl145s.mysql.com
f0fc4b88e0 Bug #24778: Innodb: No result when using ORDER BY
This bug was intruduced by the fix for bug#17212 (in 4.1). It is not 
ok to call test_if_skip_sort_order since this function will 
alter the execution plan. By contract it is not ok to call 
test_if_skip_sort_order in this context.

This bug appears only in the case when the optimizer has chosen 
an index for accessing a particular table but finds a covering 
index that enables it to skip ORDER BY. This happens in 
test_if_skip_sort_order.
2007-04-20 11:01:53 +02:00
mats@romeo.(none)
6d0fb7cbfb Merge romeo.(none):/home/bk/merge-mysql-5.0
into  romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:55:50 +02:00
joerg@debian.(none)
5de73f45f9 configure.in : Ensure that "icheck" is really the ABI checker,
not some other tool (file system checker on Tru64).

Patch originally supplied by Peter O'Gorman, slightly modified by me.

Bug#27739 "build fails on Tru64 due to icheck test in configure"
2007-04-20 10:51:53 +02:00
mats@romeo.(none)
875de0e571 Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
into  romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
mats@romeo.(none)
f1caa9559c Merge romeo.(none):/home/bkroot/mysql-5.0-rpl
into  romeo.(none):/home/bk/merge-mysql-5.0
2007-04-20 10:35:27 +02:00
mats@romeo.(none)
bb73858835 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  romeo.(none):/home/bkroot/mysql-5.0-rpl
2007-04-20 10:28:44 +02:00
mats@romeo.(none)
06a3b047fd Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
into  romeo.(none):/home/bk/b27779-mysql-5.1-rpl
2007-04-20 10:20:52 +02:00
mats@romeo.(none)
6d9631cc6e Disabling test case rpl_ndb_circular_simplex 2007-04-20 10:10:21 +02:00
gkodinov/kgeorge@magare.gmz
4c89a5960f Bug #27786:
When merging views into the enclosing statement
the ORDER BY clause of the view is merged to the
parent's ORDER BY clause.
However when the VIEW is merged into an UNION
branch the ORDER BY should be ignored. 
Use of ORDER BY for individual SELECT statements
implies nothing about the order in which the rows
appear in the final result because UNION by default
produces unordered set of rows.
Fixed by ignoring the ORDER BY clause from the merge
view when expanded in an UNION branch.
2007-04-20 10:49:45 +03:00
gkodinov/kgeorge@magare.gmz
83fff26261 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B27530-5.0-opt
2007-04-19 15:07:03 +03:00
gluh@mysql.com/eagle.(none)
16223f0d75 Bug#27499 DROP TABLE race with SHOW TABLE STATUS
They can drop table after table names list creation and before table opening.
We open non existing table and get ER_NO_SUCH_TABLE error.
In this case we do not store the record into I_S table and clear error.
2007-04-19 16:49:21 +05:00
tomas@whalegate.ndb.mysql.com
1ed4baf376 corrrection of test case 2007-04-19 06:24:36 +02:00
tomas@whalegate.ndb.mysql.com
695f768a5c revert back to old show_binlog_events asto many test failures, and create a show_binlog_events2 instead 2007-04-18 23:08:56 +02:00
tomas@whalegate.ndb.mysql.com
9afbeeedec Bug #27076
- test case
2007-04-18 21:39:45 +02:00
joerg@debian.(none)
5d4a912e54 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  debian.(none):/M50/push-5.0
2007-04-18 18:11:36 +02:00
joerg@trift2.
2a63d29d81 Merge trift2.:/MySQL/M50/fix-ndb-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-04-18 17:12:18 +02:00
joerg@trift2.
fd5c19d801 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-04-18 16:56:08 +02:00
joerg@trift2.
30dd22503e Merge trift2.:/MySQL/M50/fix-ndb-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-04-18 16:52:05 +02:00
joerg@trift2.
5fc30d25ea sql/ha_ndbcluster.cc
Hex constants that exceed 32 bit need to be marked "LL" for the compile to work.
2007-04-18 16:41:38 +02:00
tomas@whalegate.ndb.mysql.com
38f9729c2a Bug #27076 Cluster does not honor SQL_LOG_BIN flag
- both for data schema operations
- also make sure schema events vet the right server id when injected into the binlog
- use same mechanism to signal server_id in bug#17095, and reserve some "id's" for flagging special conditions on the event, in this case do not log it
- enable printing of server ids in the testcases to show that we cot it right
2007-04-18 16:02:20 +02:00
tomas@whalegate.ndb.mysql.com
da2b2300c9 Bug#17095 circular replication
- make sure any value is set for linked operations as well, e.g. blob tables
2007-04-18 15:58:30 +02:00
joerg@debian.(none)
9aa59cb934 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  debian.(none):/M50/push-5.0
2007-04-18 13:11:17 +02:00
igor@olga.mysql.com
6ad81b4e13 Fixed bug #27870. The bug that causes crashes manifests itself at some
conditions when executing an equijoin query with WHERE condition
containing a subquery predicate of the form join_attr NOT IN (SELECT ...).

To resolve a problem of the correct evaluation of the expression
  attr NOT IN (SELECT ...)
an array of guards is created to make it possible to filter out some 
predicates of the EXISTS subquery into which the original subquery 
predicate is transformed, in the cases when a takes the NULL value. 
If attr is defined as a field that cannot be NULL than such an array 
is not needed and is not created. 
However if the field a occurred also an an equijoin predicate t2.a=t1.b
and table t1 is accessed before table t2 then it may happen that the 
the EXISTS subquery is pushed down to the condition evaluated just after
table t1 has been accessed. In this case any occurrence of t2.a is 
substituted for t1.b. When t1.b takes the value of NULL an attempt is 
made to turn on the corresponding guard. This action caused a crash as 
no guard array had been created.

Now the code of Item_in_subselect::set_cond_guard_var checks that the guard
array has been created before setting a guard variable on. Otherwise the
method does nothing. It cannot results in returning a row that could be
rejected as the condition t2.a=t1.b will be checked later anyway.
2007-04-17 17:35:29 -07:00
serg@janus.mylan
dc981fc2dc added a necessary break 2007-04-17 21:15:15 +02:00
malff/marcsql@weblab.(none)
d40de44148 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-04-17 10:42:40 -06:00
jamppa@bk-internal.mysql.com
82e4afb89f Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
2007-04-17 15:52:03 +02:00
jamppa@bk-internal.mysql.com
b465b30847 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-04-17 15:45:35 +02:00
serg@janus.mylan
da240229f8 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
2007-04-17 15:44:30 +02:00
kent/mysqldev@mysql.com/production.mysql.com
c43a7b9bf7 Raise version number after cloning 5.0.40 2007-04-17 15:22:48 +02:00