Commit graph

23718 commits

Author SHA1 Message Date
mskold@mysql.com
51eb697fc0 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 15:02:48 +02:00
igor@rurik.mysql.com
4bfe1cc843 join_nested.result, join_nested.test:
Added a teast case for bug #11284.
sql_select.cc:
  Fixed bug #11284.
  Optimization with empty inner table currently cannot be
  used in the case of nested outer join.
2005-06-15 05:56:19 -07:00
mskold@mysql.com
7ce515d403 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 13:32:41 +02:00
igor@rurik.mysql.com
aeb5ab5d4c Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-15 03:39:43 -07:00
tomas@poseidon.ndb.mysql.com
66591aea02 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-06-15 12:39:42 +02:00
tomas@poseidon.ndb.mysql.com
4bca931fac Bug #11221 Mysqld does not automatically reconnecting to cluster with cluster restart 2005-06-15 12:29:55 +02:00
igor@rurik.mysql.com
46325044d0 join_outer.result, join_outer.test:
Added a test case for bug #11285.
sql_select.cc:
  Fixed bug #11285.
  The problem occurred with Item_equal in an 'on expression'
  that was evaluated to false.
2005-06-15 02:02:25 -07:00
timour@mysql.com
5f57dca57b Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-06-15 10:49:35 +03:00
mskold@mysql.com
46ee6c87dc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 09:28:35 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
dd0936cadc Fixes some of the failing test cases for Netware. 2005-06-15 10:25:03 +03:00
timour@mysql.com
3220f721dd Fix for BUG#11211 "GROUP BY doesn't work correctly"
When the GROUP BY clause contains a column reference that can be resolved to
both an aliased column in the SELECT list, and to a column in the FROM clause,
the group column is resolved to the column in the FROM clause (for ANSI conformance).
However, it may be so that the user's intent is just the other way around, and he/she
gets the query results grouped by a completely different column than expexted.
This patch adds a warning in such cases that tells the user that there is potential
ambiguity in the group column.

sql/sql_select.cc
- Added a warning when a GROUP column is ambiguous due to that there is a
  column reference with the same name both in the SELECT and FROM clauses.
  In this case we resolve to the column in FROM clause and warn the user
  of a possible ambiguity.
- More extensive comments.
- Changed the function to return bool instead of int (as in other places).

mysql-test/t/group_by.test
  Added test for BUG#11211.

mysql-test/r/group_by.result
  Added test for BUG#11211.
2005-06-15 10:12:49 +03:00
petr@mysql.com
ab06a80eed Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-06-15 03:05:41 +04:00
bell@sanja.is.com.ua
303dafc538 fix of BUG#11111 fix 2005-06-15 01:57:25 +03:00
bell@sanja.is.com.ua
50def61bef Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-06-15 01:57:23 +03:00
evgen@moonbone.local
3ece42e8a6 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  moonbone.local:/work/mysql-5.0-bug-11111
2005-06-15 02:57:22 +04:00
evgen@moonbone.local
bff2fd8d7b Fix 11 "fetch from view returns wrong data"
Wrong method for creating temporary field was choosen, which results in
sending int field with int header but lonlong data.

Test case is added to mysql_client_test.c because client library is required
to test the bug.
2005-06-15 01:57:40 +04:00
petr@mysql.com
a9d376b42b rename: store_to_string -> store_to_protocol_packet 2005-06-15 01:06:25 +04:00
bell@sanja.is.com.ua
a78cc26947 prohibit opening Query cache for SP cursors (BUG#9715) 2005-06-14 22:45:48 +03:00
hf@deer.(none)
f183b1be31 Final patch to the bug #11314 (HAVING DEFAULT hangs) 2005-06-14 20:04:42 +05:00
mskold@mysql.com
333c34d50c Added order by for failing ps_7ndb test 2005-06-14 16:40:50 +02:00
petr@mysql.com
489598716a Fix for Bug #11200 show instance options returns garbage instead of log options 2005-06-14 17:13:42 +04:00
hf@deer.(none)
8cc5f88b3b Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-06-14 17:55:44 +05:00
hf@deer.(none)
0dce646430 Addition to fix for bug #11314 (test case wasn't complete) 2005-06-14 17:50:24 +05:00
hf@deer.(none)
e4ba9388ea Fix for bug #11314 (HAVING DEFAULT() hangs) 2005-06-14 17:43:51 +05:00
mskold@mysql.com
2fd593e1af Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-14 14:25:44 +02:00
timour@mysql.com
a99599bc1a Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-bug-11044
2005-06-14 14:26:17 +03:00
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
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