dlenev@mysql.com
d14e701446
Fix for bug #12198 "Temporary table aliasing does not work inside stored
...
functions".
We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
2006-01-13 01:51:56 +03:00
serg@serg.mylan
122b597fc3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-26 08:56:59 +01:00
serg@serg.mylan
10df921c96
documenting HA_STATUS_xxx flags
2005-11-26 08:54:13 +01:00
msvensson@devsrv-b.mysql.com
0745c8f266
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/mysql-5.0
2005-11-25 22:01:51 +01:00
msvensson@devsrv-b.mysql.com
cbd1ea0708
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/mysql-5.0
2005-11-25 19:31:17 +01:00
sergefp@mysql.com
e5592190e5
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug15204
2005-11-25 20:48:26 +03:00
sergefp@mysql.com
526a1d89c9
BUG#15024: get_best_covering_ror_intersect() tries to build ROR-intersection
...
by starting with an empty index set and adding indexes to it until it
becomes covering. If the set becomes covering after adding the first index,
return NULL and don't try constructing ROR-intersection of one index (which
caused a crash)
2005-11-25 20:47:22 +03: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
msvensson@devsrv-b.mysql.com
3879027ade
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168
...
into devsrv-b.mysql.com:/space/magnus/mysql-5.0
2005-11-25 17:01:59 +01: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
3fd3e277ff
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 19:45:36 +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
serg@serg.mylan
8fb3b83805
don't call handler::info() in SHOW CREATE TABLE
2005-11-24 18:13:08 +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
msvensson@devsrv-b.mysql.com
8f457699a8
Bug #15168 yassl failure on amd64
...
- Use libtool to build libraries
2005-11-24 17:17:36 +01: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
anozdrin@mysql.com
1d1fd3d459
Make it buildable with -ansi flag on some platforms.
2005-11-24 18:42:39 +03:00
anozdrin@mysql.com
ac00e90bd6
Polishing: get rid of C++-style comments.
2005-11-24 18:27:14 +03:00
mskold@mysql.com
f27dc1c232
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-24 16:21:49 +01:00
mskold@mysql.com
70d447c1f1
Moved check of wrong schema version earlier
2005-11-24 16:21:07 +01:00
ramil@mysql.com
21a9d6a616
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 18:33:07 +04:00
timour@mysql.com
7397abc0c7
table t7 was not dropped at the end
2005-11-24 16:11:59 +02:00
pem@mysql.com
eae8414d35
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 14:14:00 +01:00
ramil@mysql.com
a7e46b2dca
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 17:04:54 +04:00
stewart@mysql.com
b513b68c11
small build fix for some compilers
2005-11-25 00:04:53 +11:00
ramil@mysql.com
b55796aff3
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 16:59:37 +04: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
stewart@mysql.com
2b57e704c3
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug15215
2005-11-24 20:58:06 +11:00
ramil@mysql.com
c0cdfe8599
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 13:42:47 +04:00
stewart@mysql.com
15227ff369
BUG#15215 mysqld fails at start-up because of illegal reply from mgmd
...
In the rare circumstance where a mysqld connects to a mgm server, then the
mgm server goes away before a node id can be allocated, it was possible to get
an Error in mgm protocol parser error message.
2005-11-24 17:30:25 +11: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
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
konstantin@mysql.com
6fab184f30
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-11-23 21:20:31 +03:00
konstantin@mysql.com
b1d951d462
Always initialize THD::thread_stack: it's used in
...
check_stack_overrun().
2005-11-23 21:18:10 +03:00
serg@serg.mylan
d50e8ea227
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-23 13:02:50 +01: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
bell@sanja.is.com.ua
1343975dda
A name of macro is fixed.
2005-11-23 12:26:07 +02:00
serg@serg.mylan
151d75c241
merged
2005-11-23 09:52:18 +01:00
joerg@mysql.com
205c6fc1e9
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-11-23 09:38:12 +01:00
bell@sanja.is.com.ua
83d692da88
postmerge fix
2005-11-23 02:49:44 +02:00
bell@sanja.is.com.ua
e6b04edbb1
merge
2005-11-23 01:29:25 +02:00