Commit graph

23710 commits

Author SHA1 Message Date
unknown
e4cdb19387 Fix for bug #10337 (cast(NULL DECIMAL) crashes the server)
mysql-test/r/cast.result:
  test result fixed
mysql-test/t/cast.test:
  test case added
sql/item_func.cc:
  checks for NULL added
strings/decimal.c:
  we need to return specified 'scale' for the rounded decimal
2005-06-15 19:02:35 +05:00
unknown
b0df449452 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
unknown
c658b990b8 Bug #11221 Mysqld does not automatically reconnecting to cluster with cluster restart 2005-06-15 12:29:55 +02:00
unknown
fd39c731b0 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
unknown
b0502fc200 Fixes some of the failing test cases for Netware. 2005-06-15 10:25:03 +03:00
unknown
476ca52ee7 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.


mysql-test/r/group_by.result:
  Import patch 11211.diff
mysql-test/t/group_by.test:
  Import patch 11211.diff
sql/sql_select.cc:
  Import patch 11211.diff
BitKeeper/etc/ignore:
  Added ndb/src/dummy.cpp to the ignore list
mysql-test/r/alias.result:
  Added warning for potentially ambiguous column.
mysql-test/r/having.result:
  Added warning for potentially ambiguous column.
2005-06-15 10:12:49 +03:00
unknown
894fd6ae07 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
unknown
4d8cbb0c27 fix of BUG#11111 fix
sql/item.h:
  revrited as recursive
sql/sql_select.cc:
  real_type is virtual
tests/mysql_client_test.c:
  check results abd delete views
2005-06-15 01:57:25 +03:00
unknown
10061029bc 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
unknown
970e20b7fe 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
unknown
4095a52a77 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.



tests/mysql_client_test.c:
  Test case for bug#11111 "fetch from view returns wrong data"
sql/sql_select.cc:
  Fix bug #11111 "fetch from view returns wrong data"
sql/item.h:
  Fix bug #11111 "fetch from view returns wrong data"
2005-06-15 01:57:40 +04:00
unknown
7f5d221393 rename: store_to_string -> store_to_protocol_packet 2005-06-15 01:06:25 +04:00
unknown
e1c2646a0c prohibit opening Query cache for SP cursors (BUG#9715)
mysql-test/r/query_cache.result:
  testing cursors in SP with QC
  testing suspicious but working using selects in function with QC
mysql-test/t/query_cache.test:
  testing cursors in SP with QC
  testing suspicious but working using selects in function with QC
sql/sp_head.h:
  method for prohibiting of QC using SP query
sql/sp_rcontext.cc:
  prohibit opening Query cache for SP cursors
sql/sp_rcontext.h:
  constructor moved to .cc file to be able to use methods from lex_keeper
2005-06-14 22:45:48 +03:00
unknown
d5600efdc1 Final patch to the bug #11314 (HAVING DEFAULT hangs)
sql/item.cc:
  it's safer not to reassign arg member
2005-06-14 20:04:42 +05:00
unknown
561ea7c0fb Fix for Bug #11200 show instance options returns garbage instead of log options
server-tools/instance-manager/commands.cc:
  Send an empty string in the option_value column, if no option value is given
2005-06-14 17:13:42 +04:00
unknown
38cf777005 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
unknown
02b1eb988d Addition to fix for bug #11314 (test case wasn't complete)
mysql-test/r/func_default.result:
  test result fixed
mysql-test/t/func_default.test:
  test case fixed
2005-06-14 17:50:24 +05:00
unknown
0473ce99fa Fix for bug #11314 (HAVING DEFAULT() hangs)
mysql-test/t/func_default.test:
  test result fixed
sql/item.cc:
  code simplified using real_item() method,
  error returning added
2005-06-14 17:43:51 +05:00
unknown
2de78782a2 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
unknown
40a1cc0d59 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
unknown
b1f306d0c4 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
unknown
d87c2dd6bf 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).


mysql-test/r/group_min_max.result:
  Added test result for BUG#11044. Notice that the group by query is
  equivalent to the distinct query and both are executed via the same
  algorithm.
mysql-test/t/group_min_max.test:
  Added test for BUG#11044. Notice that the group by query is
  equivalent to the distinct query and both are executed via the
  same algorithm.
sql/opt_range.cc:
  * Use the extended prefix in QUICK_GROUP_MIN_MAX_SELECT::get_next()
    to find keys that satisfy equality conditions in the case when there is
    no MIN or MAX function.
  * Corrected some method comments.
  * Corrected debug printout of cost information.
2005-06-14 12:52:44 +03:00
unknown
c9bf30245e 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
unknown
d5d5571114 a fix (#11235: Expression with IFNULL yields 18 where 1 is correct).
sql/item_func.cc:
  a fix (#11235: Expression with IFNULL yields 18 where 1 is correct).
  We should pass res end pointer to the strtoll10().
2005-06-14 13:40:12 +05:00
unknown
a52706ca5d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0


mysql-test/r/func_if.result:
  Auto merged
mysql-test/t/func_if.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2005-06-14 01:35:55 -07:00
unknown
ac42a5f0a6 Manual merge 2005-06-13 22:52:44 -07:00
unknown
7bb5fe9411 merge
BitKeeper/etc/logging_ok:
  auto-union
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2005-06-14 00:05:27 +02:00
unknown
91a7d4e737 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
unknown
d039d345e6 Manual merge
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/func_if.result:
  Manual merge.
2005-06-13 11:45:29 -07:00
unknown
0273608262 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-06-13 20:40:53 +02:00
unknown
a4535bc827 func_if.result, func_if.test:
Correction for test case of bug #11142.


mysql-test/t/func_if.test:
  Correction for test case of bug #11142.
mysql-test/r/func_if.result:
  Correction for test case of bug #11142.
2005-06-13 11:38:16 -07:00
unknown
89906482e0 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.


sql/item_cmpfunc.cc:
  Fixed bug #11142.
  Implementation of Item_func_nullif::is_null was corrected.
mysql-test/t/func_if.test:
  Added a test case for bug #11142.
mysql-test/r/func_if.result:
  Added a test case for bug #11142.
2005-06-13 11:24:26 -07:00
unknown
61962795f1 logging_ok:
Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout


ndb/test/ndbapi/testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-06-13 19:45:15 +02:00
unknown
1a0bddb84d 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
unknown
e802cd3bc7 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
unknown
95252da49e ha_innodb.cc:
Add a patch by Georg Richter to remove compiler warnings on 64-bit Windows


sql/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
unknown
4fcc3dd813 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
unknown
0cd6d1c6f1 Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-06-13 06:28:23 -07:00
unknown
172c03c804 Making XID deterministic for rpl_ddl test
mysql-test/r/rpl_ddl.result:
  Making XID deterministic for test
mysql-test/t/rpl_ddl.test:
  Making XID deterministic for test
2005-06-13 15:18:36 +02:00
unknown
3f483c18bd 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


sql/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
mysql-test/r/ctype_utf8.result:
  Added a test case for bug #11167.
mysql-test/t/ctype_utf8.test:
  Added a test case for bug #11167.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-06-13 06:10:19 -07:00
unknown
b665bfa56a 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
unknown
af84e4aeb9 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
unknown
ff40f30349 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
unknown
50260639aa Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_parse.cc:
  Auto merged
2005-06-13 11:13:06 +02:00
unknown
8c4fe301d0 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
unknown
828c463361 merge
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
2005-06-13 10:42:12 +02:00
unknown
53a92c875b 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
unknown
861cecf3f5 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
unknown
06ab901376 bug#10294 - ndb restore with #concurrent transactions < parallelism
Enable retry on startTransaction


ndb/tools/restore/consumer_restore.cpp:
  Enable retry on startTransaction==NULL
2005-06-13 09:09:50 +02:00
unknown
3d43153655 WL#2286 - Compile MySQL w/YASSL support
Fix for link failures on boxes with non-gnu compiler.


client/Makefile.am:
  Add a dummy C++ file to client suite to make libtool use a C++ linker:
  this lets client suite link when using yaSSL and a non-gcc C++ compiler.
config/ac-macros/yassl.m4:
  HAVE_YASSL conditional is used to add dummy C++ file if configured with yaSSL.
tests/Makefile.am:
  Add a dummy C++ file to tests to make libtool use a C++ linker:
  this lets tests link when using yaSSL and a non-gcc C++ compiler.
vio/Makefile.am:
  Use dummy C++ file if configured with yaSSL only.
2005-06-12 18:18:46 +05:00