Commit graph

6650 commits

Author SHA1 Message Date
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