holyfoot@mysql.com
c60b8e3027
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.14693
2005-11-29 13:33:56 +04:00
bar@mysql.com
0f73558ee3
Merge mysql.com:/usr/home/bar/mysql-4.1.b10446
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-11-29 09:25:51 +04:00
bar@mysql.com
5c1ba75cfd
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b10446
2005-11-29 09:21:57 +04:00
jimw@mysql.com
9df4951acb
Merge mysql.com:/home/jimw/my/mysql-5.0-14956
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:51:54 -08:00
jimw@mysql.com
99297e44d4
Merge mysql.com:/home/jimw/my/mysql-4.1-14155
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:50:23 -08:00
pem@mysql.com
341f941209
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14643/mysql-5.0
2005-11-28 15:11:26 +01:00
bar@mysql.com
2b18be14ca
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b14406
2005-11-28 17:16:39 +04:00
bar@mysql.com
814f6c6cf0
grant.result:
...
After merge fix.
2005-11-28 17:06:57 +04:00
pem@mysql.com
df553710df
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14643/mysql-5.0
2005-11-28 13:20:15 +01:00
bar@mysql.com
8f33adc13d
Merge mysql.com:/usr/home/bar/mysql-4.1.b14406
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-11-28 15:31:11 +04:00
bar@mysql.com
63b038f2e6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b14406
2005-11-28 12:45:40 +04:00
kent@mysql.com
114cf11218
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-11-28 09:44:47 +01:00
serg@serg.mylan
8d6811def7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-27 09:39:45 +01:00
igor@rurik.mysql.com
5c93bf90f3
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-11-26 13:54:21 -08:00
serg@serg.mylan
1cf71d0585
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-26 20:56:05 +01:00
serg@serg.mylan
c246aa1635
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-11-26 20:50:22 +01:00
serg@serg.mylan
6a83b75764
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-26 20:23:20 +01:00
serg@serg.mylan
701de9be0a
followup for for the bug#5686
2005-11-26 19:36:11 +01:00
dlenev@mysql.com
ca8c984e50
Enabled back bunch of tests for stored routines which were disabled
...
earlier because of various features/checks missing (these features/checks
are now implemented).
2005-11-26 19:15:17 +03:00
igor@rurik.mysql.com
881e6e681c
Fixed bug #15106 .
...
A typo bug caused loss of a predicate of the form field=const in some cases.
2005-11-25 18:51:44 -08:00
konstantin@mysql.com
c779c2c809
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 19:27:20 +03:00
konstantin@mysql.com
463175c4e8
Post-merge fixes.
2005-11-25 18:53:55 +03:00
konstantin@mysql.com
9fd6204ad1
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 13:57:13 +03:00
konstantin@mysql.com
f57dffe453
A fix and a test case for Bug#14410 "Crash in Enum or Set type in
...
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are
created in the statement memory root.
2005-11-25 13:25:31 +03:00
mskold@mysql.com
6d5ef98adc
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-25 10:56:01 +01:00
mskold@mysql.com
c2acc2da99
Updated expected error
2005-11-25 10:41:22 +01:00
bar@mysql.com
e6708aa0df
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b14146
2005-11-25 10:08:00 +04:00
evgen@moonbone.local
7a21129691
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/13293-bug-5.0-mysql
2005-11-24 22:41:52 +03:00
pem@mysql.com
01de5ef5af
Remove t3 in join_nested.test
2005-11-24 19:51:52 +01:00
pem@mysql.com
7d232f01e3
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 19:14:11 +01:00
pem@mysql.com
23cab491e9
Some post-merge cleaning, and made assert THD::store_globals() work at all times.
2005-11-24 19:13:13 +01:00
evgen@moonbone.local
e093fb1fd7
Fix bug#13293 Wrongly used index results in endless loop.
...
Loose index scan using only second part of multipart index was choosen, which
results in creating wrong keys and endless loop.
get_best_group_min_max() now allows loose index scan for distinct only if used
keyparts forms a prefix of the index.
2005-11-24 19:54:02 +03:00
holyfoot@deer.(none)
e906120ba8
Fix for bug #14693 (ALTER COLUMN SET DEFAULT has no effect)
2005-11-24 20:24:45 +04:00
evgen@moonbone.local
e3cab037bf
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14482-bug-4.1-mysql
2005-11-24 19:17:31 +03:00
evgen@moonbone.local
a4a3215a44
Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
...
crash
resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.
resolve_const_item() now substitutes constants for items with
result_type == ROW_RESULT only for Item_rows.
2005-11-24 19:16:51 +03:00
timour@mysql.com
7397abc0c7
table t7 was not dropped at the end
2005-11-24 16:11:59 +02:00
pem@mysql.com
c5475706f9
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 12:12:49 +01:00
jimw@mysql.com
81cb8ad37d
Fix handling of maximum value for MAX_ROWS on 64-bit platforms. (Bug #14155 )
2005-11-23 17:05:59 -08:00
monty@mysql.com
f5804869e3
Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
...
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk
2005-11-24 02:36:28 +02:00
jimw@mysql.com
86beb208aa
Fix result of ROW_COUNT() after 'EXECUTE prepstmt'. (Bug #14956 )
2005-11-23 14:57:26 -08:00
ranger@regul.home.lan
c571ec2da2
Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into regul.home.lan:/mnt/md/bk/mysql-5.0
2005-11-24 00:37:46 +02:00
pem@mysql.com
0411412403
Fixed BUG#13729 Stored procedures: packet error after exception handled
...
Don't set thd->is_fatal_error in sql_update for duplicate key errors.
2005-11-23 11:56:53 +01:00
serg@serg.mylan
151d75c241
merged
2005-11-23 09:52:18 +01:00
bell@sanja.is.com.ua
83d692da88
postmerge fix
2005-11-23 02:49:44 +02:00
bell@sanja.is.com.ua
db8f03ebe8
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e
Recursion support made for SP (BUG#10100).
2005-11-23 01:11:19 +02:00
bell@sanja.is.com.ua
7d2442a160
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
2005-11-23 00:58:13 +02:00
bell@sanja.is.com.ua
2bcd68973b
Fix for BUG#13549 "Server crash with nested stored procedures
...
if inner routine has more local variables than outer one, and
one of its last variables was used as argument to NOT operator".
THD::spcont was non-0 when we were parsing stored routine/trigger
definition during execution of another stored routine. This confused
methods of Item_splocal and forced them use wrong runtime context.
Fix ensures that we always have THD::spcont equal to zero during
routine/trigger body parsing. This also allows to avoid problems
with errors which occur during parsing and SQL exception handlers.
2005-11-23 00:50:37 +02:00
ranger@regul.home.lan
6d34770eb3
Added support of stress mode to mysql-test-run.pl
...
Corrected function declaration
2005-11-22 23:46:54 +02:00
serg@serg.mylan
419d82f8c2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-22 21:16:11 +01:00
