igor@rurik.mysql.com
b610c0972f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-24 08:19:02 -07:00
lars@mysql.com
f34398ba65
BUG#12532: Fix for the case when my_malloc is macro
2005-08-24 11:14:41 +02:00
timour@mysql.com
5d736f1063
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-24 10:52:30 +03:00
timour@mysql.com
04a6a8e011
Post-fix for BUG#6276.
2005-08-24 10:51:28 +03:00
igor@rurik.mysql.com
4adc90bdd6
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-23 23:22:52 -07:00
petr@mysql.com
adb8244163
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usersnfs/pchardin/mysql-5.0-virgin
2005-08-24 02:50:23 +02:00
petr@mysql.com
659809d30f
fix compilation failure appeared after monty's cleanup
2005-08-24 02:46:13 +02:00
lars@mysql.com
f98f46c471
BUG#12532: Fixes after review
2005-08-24 01:45:15 +02:00
lars@mysql.com
d8df765913
Merge mysql.com:/users/lthalmann/ltx/root/mysql-5.0
...
into mysql.com:/users/lthalmann/ltx/dev/mysql-5.0-bug12532
2005-08-24 00:16:58 +02:00
timour@mysql.com
9a6aefab3a
Fix for BUG#6276.
2005-08-23 20:03:32 +03:00
timour@mysql.com
bf8563ae1d
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-23 18:15:51 +03:00
timour@mysql.com
e040300393
WL#2486 - natural and using join according to SQL:2003
...
* Provide backwards compatibility extension to name resolution of
coalesced columns. The patch allows such columns to be qualified
with a table (and db) name, as it is in 4.1.
Based on a patch from Monty.
* Adjusted tests accordingly to test both backwards compatible name
resolution of qualified columns, and ANSI-style resolution of
non-qualified columns.
For this, each affected test has two versions - one with qualified
columns, and one without.
2005-08-23 18:08:04 +03:00
dlenev@mysql.com
603dddfdb4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg11896
2005-08-23 09:15:05 +04:00
igor@rurik.mysql.com
21b63441f5
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-22 17:46:21 -07:00
igor@rurik.mysql.com
94166de5f3
sql_show.cc:
...
Database name was set incorrectly for any show command
that used sunqueries in its where condition.
information_schema.test, information_schema.result:
Added a test case for bug #12636 .
2005-08-22 17:32:02 -07:00
jimw@mysql.com
247e9421fa
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 11:54:33 -07:00
jimw@mysql.com
bb4af4f176
Merge mysql.com:/home/jimw/my/mysql-5.0-12689
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-22 10:19:09 -07:00
monty@mishka.local
ef06534945
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-22 19:58:11 +03:00
konstantin@mysql.com
fb7be5270f
Add a comment about I_List<> copy constructor.
2005-08-22 19:23:01 +04:00
monty@mishka.local
49413542bd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-22 16:06:00 +03:00
evgen@moonbone.local
f5f6ed8b78
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/11398-bug-5.0-mysql
2005-08-22 15:46:09 +04:00
monty@mishka.local
d62295e44e
Cleanup during review of new pushed code
2005-08-22 01:13:37 +03:00
jonas@eel.(none)
5823c91f88
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:22:08 +02:00
monty@mishka.local
ba2ace25a9
Merge mishka.local:/tmp/skr99/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-08-21 13:05:15 +03:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
dce31760e4
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-08-20 21:21:49 -04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
4084c13605
Merge c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
2005-08-20 16:38:55 -04:00
serg@sergbook.mysql.com
117d61c8a0
Merge bk-internal:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2005-08-20 14:38:18 +04:00
monty@mishka.local
1c1f26d5e2
Fixes during review of new pushed code
...
Fixed new bug when running a SP without a default database
2005-08-20 11:00:00 +03:00
jimw@mysql.com
6240210305
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-19 17:53:48 -07:00
jimw@mysql.com
a3c893e0b8
Fix cases where SLEEP() calls would get optimized away or cached. (Bug #12689 )
2005-08-19 15:51:40 -07:00
igor@rurik.mysql.com
2c2f18b98b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 15:07:51 -07:00
patg@radha.local
7a43a0f54d
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-19 23:44:40 +02:00
elliot@mysql.com
55b81af671
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/home/emurphy/src/work/mysql-5.0
2005-08-19 15:29:30 -04:00
igor@rurik.mysql.com
55fd68ccd7
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 12:10:34 -07:00
elliot@mysql.com
d9efe655ed
Bug#11338 Fixes from review (identical functionality).
2005-08-19 14:49:34 -04:00
jimw@mysql.com
dd1e0fb8c7
Merge mysql.com:/home/jimw/my/mysql-5.0-11711
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-19 11:40:39 -07:00
lars@mysql.com
c79ba8e346
BUG#12532: Added more memory in malloc for slave query cache
2005-08-19 16:25:55 +02:00
serg@sergbook.mysql.com
c234386a40
the syntax is XA END xid [SUSPEND [FOR MIGRATE]]
2005-08-19 18:00:16 +04:00
timour@mysql.com
a53d283481
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-19 16:05:58 +03:00
konstantin@mysql.com
887fba4736
A fix and a test case for "Bug #12168 'DECLARE CONTINUE HANDLER FOR
...
NOT FOUND ...' in conditional handled incorrectly".
Whenever we remove an instruction during optimization, we need to
adjust instruction numbers (ip - instruction pointer) stored in all
instructions. In addition to that, sp_instr_hpush_jump, which
corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
which holds the number of instruction with the continue handler.
In the bug report, a wrong ip stored in m_handler was pointing at
FETCH, which resulted in an error message and abnormal SP termination.
The fix is to just remove m_handler member from sp_instr_hpush_jump,
as it's always points to the instruction next to the DECLARE
statement itself (m_ip+1).
2005-08-19 17:03:21 +04:00
timour@mysql.com
d053a23034
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-19 15:32:00 +03:00
timour@mysql.com
f5fc1543aa
WL#2486 - natural and using join according to SQL:2003
...
- Corrected problem with N-way nested natural joins in PS mode.
- Code cleanup
- More asserts to check consistency of name resolution contexts
- Fixed potential memory leak of name resolution contexts
2005-08-19 15:22:30 +03:00
jonas@eel.(none)
4575678ff1
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-19 13:40:40 +02:00
igor@rurik.mysql.com
2d32b77693
distinct.test, distinct.result:
...
Added test cases for bug #12625 .
sql_select.cc:
Fixed bug #12625 .
Fixed invalid removal of constant items from the DISTINCT
list in the function create_distinct_group.
2005-08-19 01:57:22 -07:00
jonas@eel.(none)
c962896744
Merge eel.(none):/home/jonas/src/mysql-5.0-push
...
into eel.(none):/home/jonas/tmp/kkk/mysql-5.0
2005-08-19 10:50:51 +02:00
bell@sanja.is.com.ua
376c5307df
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
2005-08-19 10:40:46 +03:00
andrey@lmy004.
a5ecf5f4b1
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy004.:/work/mysql-5.0-clean
2005-08-19 09:14:59 +02:00
bell@sanja.is.com.ua
a3724d2546
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
2005-08-19 08:55:38 +03:00
jonas@eel.(none)
1b1d1d8d5c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-19 07:52:42 +02:00
patg@radha.local
d0767dfad3
BUG #12498 Fixed mispelling
2005-08-19 07:51:22 +02:00