msvensson@neptunus.(none)
d8e150b427
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
2005-06-14 12:23:17 +02:00
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
mskold@mysql.com
152adbaf0b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-14 10:29:47 +02:00
georg@lmy002.wdf.sap.corp
1de6c26e97
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-06-14 09:15:15 +02:00
igor@igor-inspiron.creware.com
785fca1162
Manual merge
2005-06-13 11:45:29 -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
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
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
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
georg@lmy002.wdf.sap.corp
b64e6db5a4
fixes for windows 64-bit compiler warnings
2005-06-13 12:41:15 +02:00
joreland@mysql.com
920755dcd7
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-13 11:52:42 +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
2ebd1c0082
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-13 09:15:19 +02: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
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
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
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
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
msvensson@neptunus.(none)
6674e1e12e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-10 14:34:43 +02:00
mskold@mysql.com
e6e4087f8b
Relaxed type checking to allow int to real coercion
2005-06-10 10:34:05 +02:00
serg@serg.mylan
71a61f9545
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-10 09:15:43 +02:00
jimw@mysql.com
1055c36000
Merge mysql.com:/home/jimw/my/mysql-5.0-10543
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 19:29:55 -07:00
jimw@mysql.com
153f233627
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-09 19:27:45 -07:00
jimw@mysql.com
bb8f2663ae
Merge mysql.com:/home/jimw/my/mysql-4.1-10566
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:03:18 -07:00
serg@serg.mylan
551bdecfd9
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-09 23:00:04 +02:00
brian@brian-akers-computer.local
12a7b7af04
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-09 13:11:54 -07:00
serg@serg.mylan
601979f0a8
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-09 20:02:06 +02:00
acurtis@xiphis.org
57192cb62f
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p1-bug11028.4
2005-06-09 18:44:59 +01:00
brian@brian-akers-computer.local
1b602c3d99
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-09 09:36:44 -07:00
brian@brian-akers-computer.local
2d9c00b2f3
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-09 09:20:00 -07:00
igor@rurik.mysql.com
36a4f39bc6
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-09 09:19:57 -07:00
igor@rurik.mysql.com
e093250d5d
select.test, select.result:
...
Added a test case for bug #10084 .
sql_yacc.yy:
Fixed bug #10084 : STRAIGHT_JOIN for expressions with ON was
added.
2005-06-09 09:16:16 -07:00
acurtis@xiphis.org
3b8c3bd7e1
Merge
2005-06-09 17:15:06 +01:00
acurtis@xiphis.org
304bb0c66d
Bug#11028 Crash on create table like
...
Report error instead of crashing
2005-06-09 16:06:15 +01:00
konstantin@mysql.com
95e620485c
A fix and test case for Bug#10729 "mysql_stmt_attr_set
...
CURSOR_TYPE_READ_ONLY". The bug was that we (me) don't perform proper
cleanups of the prepared statement when done fetching from a cursor.
Another patch.
2005-06-09 18:17:45 +04:00
joreland@mysql.com
65e5d9e982
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-06-09 16:13:23 +02:00
serg@serg.mylan
81d070fdcc
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-09 15:53:35 +02:00
serg@serg.mylan
62c2a636d6
sql/mysql_priv.h
...
comments,
unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed
SELECT_ALL flag moved into this free slot.
2005-06-09 15:48:57 +02:00
joreland@mysql.com
f6bb7cabbe
merge
2005-06-09 15:44:57 +02:00
joreland@mysql.com
14d74e75db
bug#11205 - ndb - 4006 when starting scan
2005-06-09 15:39:14 +02:00
mskold@mysql.com
39fba6c556
Disallow TL_WRITE_ALLOW_READ being transformed into TL_WRITE_ALLOW_WRITE
2005-06-09 13:28:29 +02:00
holyfoot@hf-ibm.(none)
717d92f6a6
Fix for bug #10083 (round doesn't increase scale)
2005-06-09 15:27:26 +05:00