timour@mysql.com
031eeac5d0
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-11044
2005-06-14 12:57:30 +03:00
timour@mysql.com
37a84e5250
Fix for BUG#11044 - "SELECT DISTINCT on indexed column returns inconsistent results"
...
The problem was that when there was no MIN or MAX function, after finding the
group prefix based on the DISTINCT or GROUP BY attributes we did not search further
for a key in the group that satisfies the equi-join conditions on attributes that
follow the group attributes. Thus we ended up with the wrong rows, and subsequent
calls to select_cond->val_int() in evaluate_join_record() were filtering those
rows. Hence - the query result set was empty.
The problem occured both for GROUP BY queries without MIN/MAX and for queries
with DISTINCT (which were internally executed as GROUP BY queries).
2005-06-14 12:52:44 +03:00
ramil@mysql.com
7e833f3b60
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-06-14 13:41:00 +05:00
ramil@mysql.com
3ac1c2ca17
a fix ( #11235 : Expression with IFNULL yields 18 where 1 is correct).
2005-06-14 13:40:12 +05:00
igor@rurik.mysql.com
517aa8be22
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-14 01:35:55 -07:00
igor@rurik.mysql.com
12f88c67d7
Manual merge
2005-06-13 22:52:44 -07:00
ndbdev@dl145b.mysql.com
be1177c15b
merge
2005-06-14 00:05:27 +02:00
tulin@dl145c.mysql.com
14da13ea63
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-06-13 23:16:17 +02:00
igor@igor-inspiron.creware.com
785fca1162
Manual merge
2005-06-13 11:45:29 -07:00
tulin@dl145c.mysql.com
e08993f069
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-06-13 20:40:53 +02:00
igor@igor-inspiron.creware.com
754e6c0527
func_if.result, func_if.test:
...
Correction for test case of bug #11142 .
2005-06-13 11:38:16 -07:00
igor@igor-inspiron.creware.com
42271e4240
func_if.result, func_if.test:
...
Added a test case for bug #11142 .
item_cmpfunc.cc:
Fixed bug #11142 .
Implementation of Item_func_nullif::is_null was corrected.
2005-06-13 11:24:26 -07:00
tulin@dl145c.mysql.com
57ddf5223f
logging_ok:
...
Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
2005-06-13 19:45:15 +02:00
igor@igor-inspiron.creware.com
df93c2783f
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into igor-inspiron.creware.com:/home/igor/mysql-5.0
2005-06-13 10:39:58 -07:00
igor@igor-inspiron.creware.com
36ff674468
Merge igor-inspiron.creware.com:/home/igor/mysql-4.1
...
into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
2005-06-13 07:35:46 -07:00
heikki@hundin.mysql.fi
fcfc8d7ffe
ha_innodb.cc:
...
Add a patch by Georg Richter to remove compiler warnings on 64-bit Windows
2005-06-13 16:42:00 +03:00
svoj@mysql.com
142529b803
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
2005-06-13 18:35:17 +05:00
igor@igor-inspiron.creware.com
fdce34a385
Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
...
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
2005-06-13 06:28:23 -07:00
lars@mysql.com
cbe0d123f7
Making XID deterministic for rpl_ddl test
2005-06-13 15:18:36 +02:00
igor@igor-inspiron.creware.com
750fca61f9
ctype_utf8.test, ctype_utf8.result:
...
Added a test case for bug #11167 .
sql_select.cc:
Fixed bug #11167 .
In 4.1 char/varchar fields are limited by 255 characters in
length that make them longer than 255 bytes in size for such
character sets as UTF8. The functions store_record_in_cache
and read_cached_records did not take into account this
Moreover the code did not take into account that the size
of the varchar fields in 5.0 can be up to 65535 bytes
2005-06-13 06:10:19 -07:00
svoj@mysql.com
b2cb16bf7c
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
2005-06-13 17:17:58 +05:00
svoj@mysql.com
47c2e6d80e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
2005-06-13 16:16:06 +05:00
lars@mysql.com
d573d0c443
Merge mysql.com:/home/bk/b6883-mysql-4.1
...
into mysql.com:/home/bk/mysql-5.0
2005-06-13 11:56:45 +02:00
lars@mysql.com
928cb7ac13
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
2005-06-13 11:13:06 +02:00
lars@mysql.com
c199d7fd66
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/b6883-mysql-4.1
2005-06-13 11:12:10 +02:00
joreland@mysql.com
ab1eaf0b32
merge
2005-06-13 10:42:12 +02:00
joreland@mysql.com
109b150314
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-13 09:12:51 +02:00
joreland@mysql.com
3bfc52d14a
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-13 09:10:45 +02:00
joreland@mysql.com
2d64907d12
bug#10294 - ndb restore with #concurrent transactions < parallelism
...
Enable retry on startTransaction
2005-06-13 09:09:50 +02:00
svoj@mysql.com
685c844fc4
WL#2286 - Compile MySQL w/YASSL support
...
Fix for link failures on boxes with non-gnu compiler.
2005-06-12 18:18:46 +05:00
svoj@mysql.com
35dad7352d
Merge
2005-06-11 15:48:11 +05:00
jimw@mysql.com
55f962c0cf
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-10 20:11:20 -07:00
jimw@mysql.com
ff3f735c70
Merge jwinstead@production.mysql.com:my/mysql-4.1-10840
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-10 14:46:03 -07:00
reggie@mdk10.(none)
6a9ce670ea
Merge mdk10.(none):/home/reggie/bk/mysql-4.1-base
...
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
2005-06-10 16:45:54 -05:00
jimw@mysql.com
481f763255
Merge mysql.com:/home/jimw/my/mysql-4.1-9500
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-10 14:44:25 -07:00
reggie@mdk10.(none)
dea4ede2dc
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mdk10.(none):/home/reggie/bk/50test2
2005-06-10 14:18:53 -05:00
reggie@mdk10.(none)
6271cf51ac
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/41test3
2005-06-10 14:17:32 -05:00
reggie@mdk10.(none)
b45bf71d9b
Bug #10947 mysqlshow wildcard failure on Windows
2005-06-10 14:03:22 -05:00
serg@serg.mylan
b41f9b36cb
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 20:23:37 +02:00
kent@mysql.com
811e51ec84
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-10 20:12:45 +02:00
serg@serg.mylan
c9ff2b5050
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 18:40:33 +02:00
serg@serg.mylan
f265b3eb2b
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 18:11:40 +02:00
pem@mysql.comhem.se
ca0a72f815
Post-merge fix.
2005-06-10 18:06:12 +02:00
serg@serg.mylan
6f45ac2cb6
bug#11225 - distinct.test fails
2005-06-10 18:02:19 +02:00
svoj@mysql.com
a822c1ffed
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-10 20:55:36 +05:00
svoj@mysql.com
75c13cbe0b
Merge with latest yaSSL.
...
Fixes IsAligned yaSSL assertion failure.
2005-06-10 20:09:41 +05:00
pem@mysql.com
b42bf3cc55
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-06-10 16:56:34 +02:00
pem@mysql.comhem.se
46619fa0e3
Post review and additional fix for BUG#10968: Stored procedures: crash if long loop.
...
Fixed valgrind complaints. This fixes the memory leak problems for
procedured, and partially for functions. There's still a leak involving
results from functions that turned out to be too involved, so it will be
fixed separately.
2005-06-10 16:14:01 +02:00
obarnir@mysql.com
a64115d1f0
Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/omer/source/src50_0609
2005-06-10 06:58:26 -07:00
lenz@mysql.com
d11be61a51
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0
2005-06-10 15:41:30 +02:00