1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-30 04:26:45 +03:00
Commit Graph

7598 Commits

Author SHA1 Message Date
mleich@mysql.com
2545d83f31 Improvement of the auxiliary routines include/show_msg*.inc
- replace @message by $message
  --> The annoying protocol line "SET @message= <value>" will disappear.
- extended description
- some examples added
2005-06-15 19:16:17 +02:00
igor@rurik.mysql.com
ff0b7e4d73 Manual merge 2005-06-15 08:39:00 -07:00
igor@rurik.mysql.com
316815f44e cast.result, cast.test:
Added test case for bug #11283.
field.h, field.cc:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.
2005-06-15 08:27:33 -07:00
hf@deer.(none)
38aa20d380 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.10632
2005-06-15 19:56:01 +05:00
hf@deer.(none)
f1fb785b12 Fix for bug #10632 (CEILING returns wrong result) 2005-06-15 19:53:40 +05:00
hf@deer.(none)
f7cccd7ea8 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.10337
2005-06-15 19:07:11 +05:00
hf@deer.(none)
971eaa189d Fix for bug #10337 (cast(NULL DECIMAL) crashes the server) 2005-06-15 19:02:35 +05:00
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
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
tulin@dl145c.mysql.com
b232d079ae Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-15 10:40:33 +02:00
tulin@dl145c.mysql.com
a7e9ee2771 disabled.def:
failing tests in 5.0/5.1
2005-06-15 10:39:13 +02: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
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
tulin@dl145c.mysql.com
a74247bda7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-15 00:57:26 +02:00
tulin@dl145c.mysql.com
f07c0e8073 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-15 00:57:23 +02:00
bell@sanja.is.com.ua
a78cc26947 prohibit opening Query cache for SP cursors (BUG#9715) 2005-06-14 22:45:48 +03:00
mskold@mysql.com
333c34d50c Added order by for failing ps_7ndb test 2005-06-14 16:40:50 +02: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
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
ndbdev@dl145b.mysql.com
3e26223773 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-14 10:11:22 +02:00
kent@mysql.com
6fc352067d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-14 05:30:36 +02:00
ndbdev@dl145b.mysql.com
be1177c15b merge 2005-06-14 00:05:27 +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
ndbdev@dl145b.mysql.com
0257d41da1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-13 20:35:38 +02: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
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
joreland@mysql.com
84a04b4a9d merge 2005-06-13 14:09:09 +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
joreland@mysql.com
54cff2bc30 merge 2005-06-13 08:05:29 +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
kent@mysql.com
9e5baf5d02 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-11 00:23:22 +02: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
kent@mysql.com
00ddd2c700 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-06-10 21:31:39 +02:00
kent@mysql.com
a2073df284 mtr_process.pl:
Added a sleep for 5 seconds when shuting down,
  work around for strange problem with server restarts
mtr_cases.pl:
  Set default time zone as opt to mysqld
mysql-test-run.pl:
  Enabled --mysqld=<flags> to work
  Put some Windows path names into environment,
  to be used in --replace_result
mysql-test-run.sh:
  Make shell script tolerant to Windows change in test cases
2005-06-10 21:29:37 +02: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