Commit graph

6660 commits

Author SHA1 Message Date
monty@mysql.com
c0e8a8d625 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-30 03:46:38 +03:00
monty@mysql.com
aa84afb983 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-04-30 03:45:12 +03:00
monty@mysql.com
129c604032 Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598) 2005-04-30 03:14:42 +03:00
serg@serg.mylan
328f2e434a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-29 19:31:56 +02:00
jimw@mysql.com
6dc842980a Merge mysql.com:/home/jimw/my/mysql-4.1-9634
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-29 08:47:03 -07:00
jimw@mysql.com
78ff49437f Manually resolve merge 2005-04-29 08:46:03 -07:00
hf@deer.(none)
c2339a6ff0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.spaerrs
2005-04-29 20:26:11 +05:00
hf@deer.(none)
054463f975 Fix for #6553 and #8776 (no errors on bad spatial data) 2005-04-29 20:23:02 +05:00
monty@mysql.com
fbf31c4a8c CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036)
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)
2005-04-29 17:03:34 +03:00
mskold@mysql.com
56499dbe54 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-29 11:56:38 +02:00
mskold@mysql.com
aed38a0f49 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-29 11:49:54 +02:00
sergefp@mysql.com
908c5d74d4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug9821
2005-04-29 02:52:20 +04:00
jimw@mysql.com
8ef6ae7442 Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names
is set on case-sensitive file systems and the source table
was specified in something other than lowercase. (Bug #9761)
2005-04-28 15:30:42 -07:00
jimw@mysql.com
300a9920ed Add regression test for calling SOUNDEX() within stored procedure.
The bug appears to have already been fixed. (Bug #7293)
2005-04-28 14:46:54 -07:00
sergefp@mysql.com
e31b850937 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
2005-04-28 21:05:26 +04:00
sergefp@mysql.com
b2ebf51fbe Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-28 19:58:52 +04:00
msvensson@neptunus.(none)
5de370c534 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-28 13:32:52 +02:00
konstantin@mysql.com
d84ed6466b A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal
value into a char field": the patch submitted for the bug a while
ago has never been reviewed or approved to push into 4.0. Decimal
support in 5.0 resolves the issue.
Adding the test case and closing the bug report.
2005-04-28 13:06:36 +04:00
msvensson@neptunus.(none)
9e2e0deece Merge bug9911 with 5.0 2005-04-28 11:05:44 +02:00
mskold@mysql.com
78263507ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-28 10:57:08 +02:00
mskold@mysql.com
47c2c96379 Merge 2005-04-28 10:28:56 +02:00
jimw@mysql.com
518f644204 Fix 'mysql_client_test' with embedded server. (Bug #9634) 2005-04-27 17:50:48 -07:00
monty@mysql.com
b40756c27e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-04-28 00:41:39 +03:00
msvensson@neptunus.(none)
1ba85ac979 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.
2005-04-27 22:20:58 +02:00
msvensson@neptunus.(none)
1ee4426adc Little different behaviour in 5.0 and merge with new tests required these changes 2005-04-27 22:02:26 +02:00
msvensson@neptunus.(none)
bdb1441a65 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 21:40:11 +02:00
sergefp@mysql.com
1d8fe5acef Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 22:51:02 +04:00
sergefp@mysql.com
4732c3b516 Merge mysql.com:/home/psergey/mysql-4.1-bug9298
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
2005-04-27 22:49:42 +04:00
msvensson@neptunus.(none)
c76c23fcbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 18:28:57 +02:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
pem@mysql.com
254bb2570c Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-27 16:37:09 +02:00
pem@mysql.comhem.se
f769a7a8b0 Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW
(Review on irc by monty)
2005-04-27 16:35:49 +02:00
ramil@mysql.com
79f049f7b0 after-merge fix 2005-04-27 19:06:47 +05:00
ramil@mysql.com
bc6d650169 merging 2005-04-27 19:00:27 +05:00
ramil@mysql.com
82fc2ce8b7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b9803
2005-04-27 17:20:29 +05:00
monty@mysql.com
e18a155fd6 Fixed core dump bug when hot link list in key cache was empty. Bug #10167 2005-04-27 14:31:04 +03:00
pem@mysql.com
0290afcdb7 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-27 13:24:40 +02:00
msvensson@neptunus.(none)
203cdde955 Merge from 4.1 to 5.0 2005-04-27 12:56:01 +02:00
msvensson@neptunus.(none)
631f035ee9 Merge neptunus.(none):/home/msvensson/mysql/bug9911
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:17:07 +02:00
serg@serg.mylan
c35e690c12 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-27 11:43:00 +02:00
serg@serg.mylan
e7b2de98ee be sure to call top_level_item() on the new Item_cond_and,
that merges ON and WHERE (BUG#10162)
2005-04-27 01:32:44 +02:00
monty@mysql.com
3ca23bd918 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-04-26 21:09:42 +03:00
pem@mysql.comhem.se
281c0a8130 Fixed BUG#8408: Stored procedure crash if function contains SHOW
We simply have to disallow any kind of result set being sent back
  from a function. Can't see any way to make that to work.
2005-04-26 17:31:59 +02:00
ramil@mysql.com
5624641cb0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b9489
2005-04-26 19:57:15 +05:00
ramil@mysql.com
db2b729c73 A fix (bug #10176: problem with varchar keys). 2005-04-26 19:46:52 +05:00
gbichot@quadita2.mysql.com
bc7856cd1e Merge quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-04-26 16:09:04 +02:00
gbichot@quadita2.mysql.com
a95571875c checking that statements get into binlog even when they were affecting
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).
2005-04-26 15:52:04 +02:00
monty@mysql.com
220a01a838 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-04-26 16:03:20 +03:00
ramil@mysql.com
12d14eb96c Test case (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:48:16 +05:00
msvensson@neptunus.(none)
8d370fbcf9 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Implemented ha_archive::rename_table
 - Added testcases for rename
2005-04-26 11:35:52 +02:00
sergefp@mysql.com
db6cc1ed17 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
2005-04-25 04:25:32 +04:00
sergefp@mysql.com
ea347e5b06 Fix for BUG#8921: Make SHOW CREATE VIEW ignore temporary tables. 2005-04-25 04:00:35 +04:00
gbichot@quadita2.mysql.com
b75789e3d8 Fixes for BUG#10039 "MEMORY engine is reported as HEAP",
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"
2005-04-23 00:05:05 +02:00
sergefp@mysql.com
d7a1549b07 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8490-2
2005-04-23 00:52:33 +04:00
sergefp@mysql.com
307c0cf908 Fix for BUG#8490: In mysql_make_view for join algorithm views we need
to insert view's subqueries into select_lex->slave(->next)* chain. 
In case a join has several such views, don't add the same subqueries several times
(this forms a loop on the above chain which breaks many parts of the code)
2005-04-23 00:13:46 +04:00
mskold@mysql.com
fd7176121e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-22 17:40:19 +02:00
mskold@mysql.com
5411f8a6e4 Merge 2005-04-22 17:38:28 +02:00
mskold@mysql.com
9457551616 Fix for Bug #9318 drop database does not drop ndb tables 2005-04-22 15:28:23 +02:00
pem@mysql.com
5fcfb8a442 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-22 12:55:44 +02:00
pem@mysql.comhem.se
057b8aa9a8 Fixed BUG#9004: Inconsistent behaviour of SP re. warnings 2005-04-22 12:53:48 +02:00
dlenev@mysql.com
51ca05b6e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg9486
2005-04-22 10:51:04 +04:00
ramil@mysql.com
50ada0a01c A fix (Bug #9489: Problem with BIT_OR and MySQL 5.0.3) 2005-04-21 21:06:08 +05:00
acurtis@xiphis.org
c5d94db336 Merge 2005-04-21 13:34:39 +01:00
acurtis@xiphis.org
f67507588f Bug#8861 - If Return is a YEAR data type, value is not shown in year format
Bug partially fixed by 9775/9102 work on SP function return.
2005-04-21 13:22:47 +01:00
sergefp@mysql.com
c2a8d2c061 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug9912
2005-04-21 13:36:06 +04:00
sergefp@mysql.com
0e7e062465 Fix for BUG#9912: make the test handle both possible optimizer choices 2005-04-21 13:32:46 +04:00
mskold@mysql.com
8ee8108cb5 Disabled test for embedded 2005-04-21 11:11:37 +02:00
mskold@mysql.com
fcf18dafee Re-generated 2005-04-21 10:59:21 +02:00
mskold@mysql.com
b1c8e44ead Merge 2005-04-21 10:26:14 +02:00
mskold@mysql.com
e0fe3e75c7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 09:27:20 +02:00
ingo@mysql.com
5ed49fbfef Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-21 08:22:43 +02:00
igor@rurik.mysql.com
ca35e36310 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-04-20 16:39:31 -07:00
igor@rurik.mysql.com
20250dc497 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-04-20 15:08:22 -07:00
sergefp@mysql.com
c2959178ca Fix for BUG#10037
* Add 0.01 to cost of 'range'+'using index' scan to avoid optimizer choice races with 
  'index' scan.
2005-04-21 01:55:33 +04:00
ingo@mysql.com
bee3f9e95f Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-20 23:04:27 +02:00
acurtis@xiphis.org
8689083aca Bug#9775 - Stored procedures: crash if create function that returns enum or set
Fix bug and implement return type casting.
2005-04-20 18:08:42 +01:00
pem@mysql.com
ab0ff5349d Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-20 18:00:51 +02:00
pem@mysql.comhem.se
54dfe4a66a Fixed BUG#7047: Stored procedure crash if alter procedure
by simply disallowing alter procedure/function in an SP (as for drop).
2005-04-20 17:59:28 +02:00
ingo@mysql.com
692093c041 Hand merge, which needs fixes. 2005-04-20 15:50:29 +02:00
pem@mysql.comhem.se
189d6b502b Fixed BUG#6898: Stored procedure crash if GOTO statements exist
Bug in the optimizer caused an infinite loop for weird code.
2005-04-20 15:37:07 +02:00
ingo@mysql.com
8faed37945 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug7806
2005-04-20 12:24:22 +02:00
mskold@mysql.com
8f7bb4eced Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-20 11:26:57 +02:00
sergefp@mysql.com
f284512ce0 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9103
2005-04-20 12:11:06 +04:00
sergefp@mysql.com
4156f9fa44 BUG#9103 merge to 5.0 2005-04-20 12:09:56 +04:00
igor@rurik.mysql.com
87ade2e6f7 Merge of the fix for bug #9681 4.1->5.0 2005-04-19 19:00:02 -07:00
igor@rurik.mysql.com
25c396628a sql_select.cc:
Fixed bug #9681.
  The bug happened with queries using derived tables specified by
  a SELECT with ROLLUP, such as:
  SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
  if column a of table t1 is declared as NOT NULL.
  This was to the fact that the first column of the temporary table
  created to contain the derived table erroneously inherited the NOT NULL
  attribute from column a.
olap.result, olap.test:
  Added a test case for bug #9681.
2005-04-19 16:54:30 -07:00
mskold@mysql.com
dbd035818b Disabled ndb tests for embedded 2005-04-19 17:23:49 +02:00
ingo@mysql.com
792b816b1b Bug#7806 - insert on duplicate key and auto-update of timestamp
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.
2005-04-19 15:12:32 +02:00
mskold@mysql.com
d4b862f076 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-19 12:51:20 +02:00
acurtis@xiphis.org
77a9429c13 Bug#7648 - Stored procedure crash when invoking a function that returns a bit
bugfix 9102 corrected the crashing, this corrects the result.
2005-04-19 10:51:11 +01:00
ramil@mysql.com
775010a40d A fix (bug #9837: round(1, 6) delivers wrong value in create table context). 2005-04-19 14:44:54 +05:00
mskold@mysql.com
4193a314fb Fix for Bug #9691 UPDATE fails on attempt to update primary key 2005-04-19 11:21:26 +02:00
acurtis@xiphis.org
f638e5cb8f Bug#9102 - Stored proccedures: function which returns blob causes crash
Initialization of fields for sp return type was not complete.
2005-04-19 09:09:25 +01:00
igor@rurik.mysql.com
60164ced47 view.result:
Correction after fix for bug #9902.
2005-04-18 14:44:14 -07:00
sergefp@mysql.com
969263cf1d Post merge fix - updated the test results (BUG#9439) 2005-04-18 22:30:22 +04:00
dlenev@mysql.com
8d7eb82a2a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-04-18 16:03:07 +04:00
dlenev@brandersnatch.localdomain
03d8c01a4c Fixed test results after merging fix for bug #8068 "TIMEDIFF with first
negative argument gives wrong result" into 5.0 tree.
2005-04-18 15:58:58 +04:00
dlenev@mysql.com
a95ede0527 Manual merge of patch for bug #8068 "TIMEDIFF with first negative
argument gives wrong result" (and similar bug in ADDTIME/SUBTIME)
into 5.0 tree.
2005-04-18 14:29:31 +04:00
dlenev@brandersnatch.localdomain
91c482e4a1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
2005-04-18 13:54:42 +04:00
pem@mysql.com
c8c4ecf462 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-18 11:27:02 +02:00
sergefp@mysql.com
9fbdd4e03f Fix for BUG#9298: Make int->string conversion sign-aware in Protocol_simple::store_long 2005-04-18 07:26:23 +04:00
sergefp@mysql.com
a76ecc5bc7 Fix for BUG#9103:
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.
2005-04-18 05:21:44 +04:00
sergefp@mysql.com
39f412d329 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug9439
2005-04-17 20:56:36 +04:00
sergefp@mysql.com
f9ec5658c7 Merge fix for BUG#9439 from 4.1 2005-04-17 20:54:31 +04:00
sergefp@mysql.com
ba3795f1d4 Post-merge fixes 2005-04-17 02:10:43 +04:00
sergefp@mysql.com
5147f85c62 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-look-range
2005-04-17 02:06:17 +04:00
sergefp@mysql.com
2ef1963c91 Fix for BUG#9348: when computing union of two intervals set lower bound to
minimum of lower bounds of two joined intervals.
2005-04-17 02:05:09 +04:00
sergefp@mysql.com
6b4e759cf7 Fix for BUG#9439:
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)
2005-04-16 23:35:39 +04:00
ingo@mysql.com
ab0acbe14d Merge 2005-04-16 17:58:11 +02:00
ingo@mysql.com
e0e3def7c7 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 17:44:04 +02:00
monty@mishka.local
571ee3c8f0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2005-04-16 11:43:03 +03:00
monty@mishka.local
de1b1fe54d Added more rows to test to get predictable results 2005-04-16 10:53:30 +03:00
igor@rurik.mysql.com
285f11064d Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-04-15 22:35:29 -07:00
igor@rurik.mysql.com
d92d4007f2 subselect.result, subselect.test:
Added a test case for bug #9516.
item_subselect.h:
  Fixed bug #9516.
  The bug was due to that fact that the class Item_subselect
  inherited the generic implementation of the function
  not_null_tables that was not valid for the objects
  of this class. As a result evaluation of the
  not_null_tables attribute was not correct for subqueries.
  This caused invalid transformations of outer joins into
  inner joins.
2005-04-15 22:08:34 -07:00
igor@rurik.mysql.com
0f043429e4 subselect.result, subselect.test:
Added a test case for bug #9338.
sql_select.cc:
  Fixed bug #9338.
  When an occurence of a field reference has to be replaced
  by another field reference the whole Item_field must be
  replaced.
item.cc:
  Fixed bug #9338.
  The method Item_field::replace_equal_field_processor was
  replaced by Item_field::replace_equal_field. The new method
  is used to replace the occurences of Item_field objects.
item.h:
  Fixed bug #9338.
  The virtual function replace_equal_field_processor was replaced
  by replace_equal_field. The latter is supposed to be used as a
  callback function in calls of the method transform.
2005-04-15 20:43:45 -07:00
dlenev@brandersnatch.localdomain
6b0b4734d9 Fix for bug #9486 "Can't perform multi-update in stored procedure".
New more SP-locking friendly approach to handling locks in multi-update.
Now we mark all tables of multi-update as needing write lock at parsing
stage and if possible downgrade lock at execution stage (For its work
SP-locking mechanism needs to know all lock types right after parsing
stage).
2005-04-15 20:31:47 +04:00
ingo@mysql.com
990ebef7f6 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-15 17:16:42 +02:00
pem@mysql.comhem.se
da22f75b68 Fixed BUG#9902: Crash with simple stored function using user defined variables
... actually, it was a query cache problem. (It shouldn't cache such queries)
2005-04-15 11:06:25 +02:00
konstantin@mysql.com
06c5e43c56 A test case for Bug#4956 (decimal -> string conversion problem) 2005-04-14 15:14:34 -07:00
serg@serg.mylan
4757803662 merged 2005-04-14 21:31:22 +02:00
serg@serg.mylan
533e0551f2 TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
bug#8151
2005-04-14 18:14:54 +02:00
pem@mysql.com
e461c7969b Merge 2005-04-14 16:10:18 +02:00
pem@mysql.comhem.se
6aad6835c6 Fixed BUG#9598: stored procedure call within stored procedure
overwrites IN variable
  and added error checking of variables for [IN]OUT parameters while
  rewriting the out parameter handling.
2005-04-14 14:52:35 +02:00
ramil@mysql.com
9f440d2b20 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-14 16:39:42 +05:00
ramil@mysql.com
1dc796a12e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.bit_class
2005-04-14 14:33:28 +05:00
ramil@mysql.com
b2dbaea394 Bit type: fix for create_field::create_field(). 2005-04-14 14:32:25 +05:00
mleich@mysql.com
7880393b39 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/matthias/Arbeit/mysql-4.1/src-clean
2005-04-14 10:48:43 +02:00
igor@rurik.mysql.com
b622aba19f information_schema.result, information_schema.test:
Added a test in connection with the fix for
  bug #6106.
view.result, view.test:
  Added test cases for bugs #6106/6107.
sql_show.cc:
  The addition of the case for items of the type REF_ITEM in the
  function uses_only_table_name_fields became necessary after
  the fix for bug #6106.
sql_base.cc:
  The problem was due to the fact that two different column
  references were glued together though one of them belonged to
  a subquery while another to an outer query. This caused
  eventually a wrong calculation of values for the used_tables
  attribute.
2005-04-13 23:06:37 -07:00
jimw@mysql.com
f7d89dd468 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-13 12:46:19 -07:00
konstantin@mysql.com
ced4317774 Allow SQLCOM_CALL in prepared mode. 2005-04-13 12:36:15 -07:00
jimw@mysql.com
62b78d4182 Merge from 4.1 2005-04-13 10:38:11 -07:00
jimw@mysql.com
0162702290 Fix ctype_ucs_binlog test when ucs2 not available 2005-04-13 09:02:12 -07:00
pem@mysql.comhem.se
7a4f495f5b Fixed BUG#9674: Stored Procs: Using declared vars in algebric operation
causes system crash.
2005-04-13 17:43:53 +02:00
pem@mysql.comhem.se
387afb3d29 Fixed BUG#9856: Stored procedures: crash if handler for sqlexception, not found. 2005-04-13 16:57:49 +02:00
pem@mysql.comhem.se
6a46d0cd8a Added test case for BUG#6129: Stored procedure won't display @@sql_mode value. 2005-04-13 16:09:28 +02:00
mleich@mysql.com
d1806d7870 Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan 2005-04-13 11:47:28 +02:00
jimw@mysql.com
3dcfc31e76 Remove references to result.es files 2005-04-12 18:04:32 -07:00
serg@serg.mylan
32221d9b9e Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-12 23:12:26 +02:00
serg@serg.mylan
b3e54c9aee mysql-test/r/flush_block_commit.result
correct result after bugfix
sql/sql_class.cc
    initialize net.query_cache_query
2005-04-12 23:08:19 +02:00
pem@mysql.com
24d4264d02 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-12 18:13:29 +02:00
serg@serg.mylan
3ab03ccbb0 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-12 17:22:14 +02:00
serg@serg.mylan
d4a0becc8a FLUSH TABLES WITH READ LOCK should block writes to binlog too 2005-04-12 17:15:54 +02:00
pem@mysql.comhem.se
9c21006f81 Fixed BUG#7185: Stored procedure crash if identifier is AVG 2005-04-12 15:43:24 +02:00
msvensson@neptunus.(none)
a1c4918a6c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-12 14:51:03 +02:00
msvensson@neptunus.(none)
7387030e67 BUG#8924 'Explain' shows different strategy
- If number of records in table is 4, the calculated cost for using "index" and "range" become so close so that any rounding errors becomes visible.
 - Added one more record to the tables for heap test and expoect "range" to be selected
 - Decrease number of records in t1 for range and expect "index" to be choosen.
2005-04-12 12:04:43 +02:00
ramil@mysql.com
3b1c3d8c68 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.bit_class
2005-04-12 12:30:09 +05:00
ramil@mysql.com
c4376b2bc6 Bit type support for non-MyISAM tables. 2005-04-12 12:27:43 +05:00
serg@serg.mylan
98601055b6 backport kill.test fix from 5.0 2005-04-11 22:36:07 +02:00
reggie@mdk10.(none)
4bb4a285ab Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-04-11 09:29:49 -05:00
bar@mysql.com
71f530c4ea merge 2005-04-11 15:11:52 +05:00