Commit graph

53276 commits

Author SHA1 Message Date
kaa@kaamos.(none)
3ef2f282bb Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-17 15:57:28 +03:00
kaa@kaamos.(none)
5671fb90e7 Post-merge fix. 2008-02-17 15:07:41 +03:00
kaa@kaamos.(none)
5647dee192 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-17 14:57:01 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
7abba3b021 Bug #32942 now() - interval '7200' second NOT pre-calculated, causing "full table scan"
Problem is not about intervals and doesn't actually cause 'full table scan'.
We have an optimization for DISTINCT when we have
'DISTINCT field_from_first_join_table' we don't need to read all the
rows from the JOIN-ed table if we found one conforming row.
It stopped working in 5.0 as we return NESTED_LOOP_OK if we came upon
that case in the evaluate_join_record() and that doesn't break the
recordreading loop in sub_select().

Fixed by returning NESTED_LOOP_NO_MORE_ROWS in this case.
2008-02-17 15:48:17 +04:00
kaa@kaamos.(none)
cb80b23e23 Merge kaamos.(none):/data/src/opt/mysql-4.1-opt
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-17 14:38:50 +03:00
kaa@kaamos.(none)
3daeb40f1f Merge kaamos.(none):/data/src/mysql-5.0
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-17 14:37:39 +03:00
kaa@kaamos.(none)
7b9dce58d9 Merge kaamos.(none):/data/src/mysql-4.1
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
2008-02-17 14:33:20 +03:00
gkodinov/kgeorge@magare.gmz
88af101d44 merge of bug 31887 5.0-opt->5.1-opt 2008-02-16 11:11:13 +02:00
gkodinov/kgeorge@magare.gmz
047b1a66a0 Merge magare.gmz:/home/kgeorge/mysql/work/B31887-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B31887-5.1-opt
2008-02-16 10:48:33 +02:00
gkodinov/kgeorge@magare.gmz
a781c1b140 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31887-5.0-opt
2008-02-15 18:34:03 +02:00
gkodinov/kgeorge@magare.gmz
490ec62be4 Bug #31887: DML Select statement not returning same results
when executed in version 5

Zero fill is a field attribute only. So we can't always 
propagate  constants for zerofill fields : the values and 
expression results don't have that flag.

Fixed by converting the const value to a string and 
using that in const propagation when the context allows it. 
Disable const propagation for fields with ZEROFILL flag in
all the other cases.
2008-02-15 15:47:32 +02:00
anozdrin/alik@quad.
b25de63309 Add a test case for Bug#21704: Renaming column does not update
FK definition.
2008-02-15 14:14:09 +03:00
mkindahl@dl145h.mysql.com
a1a94e238f Adding waits to events_scheduling to prevent the test from
failing on heavily loaded systems.
2008-02-15 10:24:13 +01:00
pcrews@pcrews-mac-local.local
0a62b5584c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/34468/mysql-5.1-build-34468
2008-02-14 11:54:56 -05:00
anozdrin/alik@quad.
6bf1306b13 A patch for Bug#18834: ALTER TABLE ADD INDEX on table with
two timestamp fields.
  
The actual problem here was that CREATE TABLE allowed zero
date as a default value for a TIMESTAMP column in NO_ZERO_DATE mode.
  
The thing is that for TIMESTAMP date type specific rule is applied:
  column_name TIMESTAMP == column_name TIMESTAMP DEFAULT 0
whever for any other date data type
  column_name TYPE == column_name TYPE DEFAULT NULL
  
The fix is to raise an error when we're in NO_ZERO_DATE mode and
there is TIMESTAMP column w/o default value.
2008-02-14 18:13:40 +03:00
kaa@kaamos.(none)
6736c1b9e7 Post-merge fix after merging the patch for bug#31590 to 5.1:
suppress the "Out of sort memory" error in the error log.
2008-02-14 16:33:11 +03:00
pcrews@pcrews-mac-local.local
dd71e64ae7 Bug#34468 - csv_not_null fails
Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
of expecting warning and re-recorded .result file.
2008-02-14 08:17:47 -05:00
kaa@kaamos.(none)
eeab00e3d0 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-14 12:54:23 +03:00
mkindahl@dl145h.mysql.com
fd5d7fa761 Fixing test rpl_events to not give false failures. 2008-02-14 10:53:12 +01:00
kaa@kaamos.(none)
88132e290a Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-14 12:49:39 +03:00
kaa@kaamos.(none)
f41a5edfc7 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-02-14 12:48:25 +03:00
mkindahl@dl145h.mysql.com
8906700e13 Fixes to try to handle valgrind warnings identical to those in
BUG#24387, which is closed since long.
2008-02-14 09:53:01 +01:00
tsmith@ramayana.hindu.god
cd6e2ad99f Bug #21158 mysql_config doesn't include -lmygcc
Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.

Required when linking against our static libs, if yassl is used, and gcc
used to build library is significantly different from that which is using
the library.
2008-02-14 01:05:25 -07:00
tomas@poseidon.bredbandsbolaget.se
fe9ee5c7bf correct merge error 2008-02-14 00:02:25 +01:00
tomas@poseidon.bredbandsbolaget.se
be0324b005 correct manual merge 2008-02-13 23:10:47 +01:00
gshchepa/uchum@host.loc
e49dffa81d Merge host.loc:/home/uchum/work/5.1-opt-gca
into  host.loc:/home/uchum/work/5.1-opt
2008-02-14 01:33:06 +04:00
tomas@poseidon.bredbandsbolaget.se
1414ba3aed Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-13 20:59:55 +01:00
tomas@poseidon.bredbandsbolaget.se
3f95d153f6 correction of merge 2008-02-13 20:52:01 +01:00
kaa@kaamos.(none)
7a0800cf7f Post-merge fixes. 2008-02-13 21:57:50 +03:00
joerg@trift2.
cc72fa880e Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 17:08:48 +01:00
joerg@trift2.
480a15dc44 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 16:58:37 +01:00
joerg@trift2.
89d5b47c6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  trift2.:/MySQL/M50/push-5.0
2008-02-13 16:55:22 +01:00
gshchepa/uchum@host.loc
814314be6b Merge host.loc:/home/uchum/work/5.0-opt-gca
into  host.loc:/home/uchum/work/5.0-opt
2008-02-13 19:47:39 +04:00
gshchepa/uchum@host.loc
e64b879510 Merge host.loc:/home/uchum/work/5.0-opt-gca
into  host.loc:/home/uchum/work/5.1-opt-gca
2008-02-13 19:37:05 +04:00
gshchepa/uchum@host.loc
18770a0de8 Fixed bug#31194: Privilege ordering does not order properly
for wildcard values.
The server ignored escape character before wildcards during
the calculation of priority values for sorting of a privilege
list. (Actually the server counted an escape character as an
ordinary wildcard like % or _). I.e. the table name template
with a wildcard character like 'tbl_1' had higher priority in
a privilege list than concrete table name without wildcards
like 'tbl\_1', and some privileges of 'tbl\_1' was hidden
by privileges for 'tbl_1'.

The get_sort function has been modified to ignore escaped
wildcards as usual.
2008-02-13 19:34:12 +04:00
gshchepa/uchum@host.loc
8f6ecbca82 Fixed bug#33764: Wrong result with IN(), CONCAT() and implicit
type conversion.

Instead of copying of whole character string from a temporary
buffer, the server copied a short-living pointer to that string
into a long-living structure. That has been fixed.
2008-02-13 19:32:19 +04:00
df@pippilotta.erinye.com
c78d616938 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2008-02-13 14:44:56 +01:00
joerg@trift2.
9337cfbb39 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:49:49 +01:00
joerg@trift2.
51f81b0209 Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:40:53 +01:00
joerg@trift2.
341258dba4 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:05:07 +01:00
joerg@trift2.
d500b8650d Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-02-13 12:58:10 +01:00
joerg@trift2.
e31275c481 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-02-13 12:48:25 +01:00
mkindahl@dl145h.mysql.com
32853b9fa5 Removing non-deterministic tests from events_scheduling test. 2008-02-13 12:41:54 +01:00
tomas@poseidon.ndb.mysql.com
f9a38a9e4e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-13 12:36:57 +01:00
mkindahl@dl145h.mysql.com
b1fadc4cf9 The test rpl_row_charset and it dependent rpl_ndb_charset is
irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.

This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.
2008-02-13 11:37:06 +01:00
anozdrin/alik@quad.
7e88f7718c Additional patch for Bug#31222: com_% global status counters
behave randomly with mysql_change_user.

The test case had to be moved into not_embedded_server.test file,
because SHOW GLOBAL STATUS does not work properly in embedded
server (see bug 34517).
2008-02-13 13:00:24 +03:00
kaa@kaamos.(none)
9f194149b8 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-13 12:12:00 +03:00
anozdrin/alik@quad.
265dbd3056 Additional patch for Bug#32538. Fix result files of windows test cases. 2008-02-13 12:02:16 +03:00
tomas@poseidon.bredbandsbolaget.se
cc6c696330 Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-13 08:07:24 +01:00
kaa@kaamos.(none)
a44413741a Merge mbp:src/opt/bug33389/my51-bug25162
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-12 22:51:25 +03:00