Commit graph

44423 commits

Author SHA1 Message Date
joerg@trift2.
b5265a3660 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-03-12 14:52:30 +01:00
kent@kent-amd64.(none)
43e3a9b56a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 13:37:51 +01:00
kent@kent-amd64.(none)
9d396c6996 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 13:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
e10e81d154 mysys_ia64.dsp, mysys.vcproj:
Removed references to unused files
2007-03-12 13:18:48 +01:00
df@pippilotta.erinye.com
baaf7ac5da add missing test cases to windows binary distribution 2007-03-12 13:15:43 +01:00
kent@mysql.com/kent-amd64.(none)
cad1c35618 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-12 13:15:11 +01:00
kent@mysql.com/kent-amd64.(none)
4e4f184170 Makefile.am, configure.in, mysys.dsp:
Removed unused files
.del-my_winsem.c:
  Delete: mysys/my_winsem.c
.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
  Delete: include/my_semaphore.h
2007-03-12 13:12:42 +01:00
gkodinov/kgeorge@magare.gmz
f2ce1445e1 group_by.result:
WL3527: disable wrong optimization.
sql_select.cc:
  WL#3527: disable wrong optimization.
2007-03-12 13:20:46 +02:00
df@pippilotta.erinye.com
26f979c822 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-03-12 11:26:09 +01:00
df@pippilotta.erinye.com
a5a5bdc79f Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-03-12 11:25:10 +01:00
igor@olga.mysql.com
d0a6231201 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26963
2007-03-12 02:24:09 -07:00
knielsen@ymer.(none)
2e43ab09cb Merge ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb
2007-03-12 10:18:34 +01:00
igor@olga.mysql.com
06a315ded6 Fixed bug #26738: incomplete string values in a result set column
when the column is to be read from a derived table column which 
was specified as a concatenation of string literals.
The bug happened because the Item_string::append did not adjust the
value of Item_string::max_length. As a result of it the temporary 
table column  defined to store the concatenation of literals was 
not wide enough to hold the whole value.
2007-03-12 01:39:57 -07:00
knielsen@ymer.(none)
4fe26832e4 Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-03-12 08:42:59 +01:00
igor@olga.mysql.com
e7284ace4f Fixed bug #26963: invalid optimization of the pushdown conditions
after single-row table substitution could lead to a wrong result set.
The bug happened because the function Item_field::replace_equal_field
erroniously assumed that any field included in a multiple equality
with a constant has been already substituted for this constant.
This not true for fields becoming constant after row substitutions
for constant tables.
2007-03-11 23:34:40 -07:00
gkodinov/kgeorge@magare.gmz
a474f33494 WL3527: post-merge updates
sql_yacc.yy:
  WL3527: updated the diff to use correct parser words
table.cc:
  WL3527: exteneded the fix for bug #20604 to fit the new variables
sql_select.cc:
  WL3527: renamed used_keys to covering_keys
2007-03-11 14:31:43 +02:00
gkodinov/kgeorge@magare.gmz
a4e6077c8a Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
2007-03-11 11:45:13 +02:00
gkodinov/kgeorge@magare.gmz
316b9e3153 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
2007-03-11 10:17:09 +02:00
gkodinov/kgeorge@magare.gmz
dcbeedca18 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.0-opt-merge-5.1-opt
2007-03-11 10:12:34 +02:00
gkodinov/kgeorge@magare.gmz
ea99afb4f4 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.0-opt-merge
2007-03-11 10:10:33 +02:00
evgen@moonbone.local
11d37efa5e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
2007-03-11 00:26:45 +03:00
evgen@moonbone.local
f3e56b5adb Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
2007-03-10 19:57:18 +03:00
evgen@moonbone.local
6f6b9ae3ad Bug#15757: Wrong SUBSTRING() result when a tmp table was employed.
When the SUBSTRING() function was used over a LONGTEXT field the max_length of
the SUBSTRING() result was wrongly calculated and set to 0. As the max_length
parameter is used while tmp field creation it limits the length of the result
field and leads to printing an empty string instead of the correct result.

Now the Item_func_substr::fix_length_and_dec() function correctly calculates
the max_length parameter.
2007-03-10 19:55:34 +03:00
evgen@moonbone.local
e7a309197b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
2007-03-10 19:53:59 +03:00
istruewing@chilla.local
17dcc22a6e Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-bug25673
2007-03-10 17:01:52 +01:00
istruewing@blade08.mysql.com
8fb003f503 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.0-bug25673
2007-03-10 15:08:56 +01:00
holyfoot/hf@hfmain.(none)
e39e1c46b0 Merge mysql.com:/home/hf/work/26833/my50-26833
into  mysql.com:/home/hf/work/26833/my51-26833
2007-03-10 17:45:02 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
6088b025d7 bug #26833 (Compile error with embedded lib)
org_tables declaration was mistakenly #ifdef-ed with the EMBEDDED_LIBRARY
instead of ACCESS_CHECKS
2007-03-10 17:44:25 +04:00
igor@olga.mysql.com
ec4593f59a Fixed bug #26830: a crash for the query with a subselect containing ROLLUP.
Crash happened because the function get_best_group_min_max detected
joins with ROLLUP incorrectly.
2007-03-10 02:47:47 -08:00
tomas@poseidon.mysql.com
1debcc5512 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-10 11:57:10 +07:00
tomas@poseidon.mysql.com
1b872243ab Merge poseidon.mysql.com:/home/tomas/mysql-5.0
into  poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-10 11:49:08 +07:00
tomas@poseidon.mysql.com
52b975a1c8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  poseidon.mysql.com:/home/tomas/mysql-5.0
2007-03-10 11:49:04 +07:00
tomas@poseidon.mysql.com
9ef9bfddd4 disabling _new_ unstable test case 2007-03-10 11:46:20 +07:00
knielsen@ymer.(none)
24a816e813 BUG#27018: Partial blob write inside blob clobbers data after the write.
When doing partial blob update with NdbBlob::writeData(), zero-padding
after the write was wrongly done, causing part of the old blob value
to be overwritten with zeros (or spaces for text field).

Fixed by only padding when needed (when writing at end of the blob).
2007-03-09 23:37:33 +01:00
mjorgensen@production.mysql.com
0b769c25aa Merge bk-internal:/home/bk/mysql-5.1-build
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
2007-03-09 23:20:50 +01:00
mjorgensen@production.mysql.com
6be30eec86 Merge bk-internal:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build
2007-03-09 23:01:12 +01:00
evgen@moonbone.local
04f5c46d5d Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimized
away.

Additional fix for bug#22331. Now Item_field prints its value in the case of
the const field.
2007-03-10 00:29:02 +03:00
kroki/tomash@moonlight.home
09d89e9cdd Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug16425
2007-03-09 23:25:36 +03:00
xxx/istruewing@blade08.mysql.com
1781a96fc5 Merge bk://localhost:5556
into  blade08.mysql.com:/data0/istruewing/autopush/mysql-5.1-bug25673
2007-03-09 19:52:14 +01:00
istruewing@chilla.local
3e608ee1f0 Merge chilla.local:/home/mydev/mysql-5.0-bug25673
into  chilla.local:/home/mydev/mysql-5.1-bug25673
2007-03-09 19:50:49 +01:00
guilhem@gbichot3.local
eaf7728d9f Fix for BUG#735 "Prepared Statements: there is no support for Query
Cache".
WL#1569 "Prepared Statements: implement support of Query Cache".
Prepared SELECTs did not look up in the query cache, and their results
were not stored in the query cache. This made them slower than
non-prepared SELECTs in some cases.
The fix is to re-use the expanded query (the prepared query where
"?" placeholders are replaced by their values, at execution time)
for searching/storing in the query cache.
It works fine for statements prepared via mysql_stmt_prepare(), which
are the most commonly used and were the scope of this bugfix and WL.
It works less fine for statements prepared via the SQL command
PREPARE...FROM, which are still not using the query cache if they
have at least one parameter (because then the expanded query contains
names of user variables, and user variables don't work with the
query cache, even in non-prepared queries).
Note that results from prepared SELECTs, which are in the binary
protocol, and results from normal SELECTs, which are in the text
protocol, ignore each other in the query cache, because a result in the
binary protocol should never be served to a SELECT expecting the text
protocol and vice-versa.
Note, after this patch, bug 25843 starts applying to query cache
("changing default database between PREPARE and EXECUTE of statement
breaks binlog"), we need to fix it.
2007-03-09 18:09:57 +01:00
gkodinov/kgeorge@magare.gmz
c03a483c51 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt
2007-03-09 17:54:13 +02:00
istruewing@chilla.local
0c77069ca6 Merge chilla.local:/home/mydev/mysql-4.1-bug25673
into  chilla.local:/home/mydev/mysql-5.0-bug25673
2007-03-09 16:40:30 +01:00
istruewing@chilla.local
af17853d5e Bug#25673 - spatial index corruption, error 126 incorrect key file for table
Fixed a compiler warning, deteced by pushbuild only.
2007-03-09 16:19:42 +01:00
guilhem@gbichot3.local
8efe1b1fae manual merge 2007-03-09 16:06:08 +01:00
gkodinov/kgeorge@magare.gmz
4d7e5c2018 Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt
2007-03-09 16:38:02 +02:00
gkodinov/kgeorge@magare.gmz
f05dff00b0 Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt
2007-03-09 16:34:23 +02:00
gkodinov/kgeorge@magare.gmz
7acdb67643 Merge bk-internal:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge
2007-03-09 16:30:44 +02:00
tomas@poseidon.mysql.com
58d0267bb5 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1
2007-03-09 21:02:52 +07:00