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
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
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
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
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
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
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