konstantin@mysql.com
f2377c4dc9
manual merge
2003-12-04 18:15:45 +03:00
pem@mysql.comhem.se
98bfc5a6c6
Fixed another compiler error on HP-UX.
2003-12-04 15:54:37 +01:00
pem@mysql.com
c57cebfe2a
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2003-12-04 15:21:57 +01:00
pem@mysql.comhem.se
a5780a4815
Fixed BUG#336: Subselects with tables does not work as values for local SP variables
...
and BUG#1654: Stored Procedure Crash if contains subquery and set function
Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
The latter should work, but turned out to be difficult to fix, so we just
disallow it for the time being.
2003-12-04 15:17:55 +01:00
lenz@kallisto.local
b1406b3be6
- Added missing backslash to sql/Makefile.am that prevented the sp_* header
...
files from being included in the source distribution
2003-12-04 12:02:18 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
55d4248dae
Merge for update
2003-12-02 20:57:34 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
afc619f0a2
WorkLog#1280 - Remove fixed table handler from lex/yacc
2003-12-02 20:23:13 +00:00
sergefp@mysql.com
e375fade90
Merge mysql.com:/home/psergey/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-compile
2003-12-02 21:31:46 +03:00
sergefp@mysql.com
43221ad9e1
Fix for bug #1980
2003-12-02 21:20:51 +03:00
pem@mysql.com
2c16ccdbe6
Merge mysql.com:/home/pem/work/mysql-4.1
...
into mysql.com:/home/pem/work/mysql-5.0
2003-12-02 17:08:24 +01:00
konstantin@mysql.com
1be4a37fa2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-02 18:06:25 +03:00
hf@deer.(none)
02f382ecaa
Fix for #1189 (Mess with names about CONSTRAINT)
...
Second edition: error message was deleted as Segey suggested
Now name of the constraint will be used as the name of the key
if the last not specified
2003-12-02 19:06:24 +04:00
konstantin@oak.local
c10413abda
Item_param::save_in_field():
...
thd->command can be anything except COM_EXECUTE in no cases
except programming error.
2003-12-02 15:09:35 +03:00
konstantin@mysql.com
f274f72c98
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-02 13:10:25 +03:00
igor@rurik.mysql.com
e282c8cc6f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-1
2003-12-01 16:20:46 -08:00
igor@rurik.mysql.com
441ad81b48
join_outer.result, null.result, null.test:
...
Fixed inconsistency of values of used_tables_cache
and const_item_cache for Item_func_isnull objects (bug #1990 ).
item_cmpfunc.h:
Fixed inconsistency of values of used_tables_cache
and const_item_cache for Item_func_isnull objects (bug #1990 ).
2003-12-01 16:12:05 -08:00
igor@rurik.mysql.com
dcbbbe6b94
join_outer.result, null.result, null.test, item_cmpfunc.h:
...
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects (bug #1990 ).
2003-12-01 13:59:09 -08:00
konstantin@oak.local
f35787b628
cleanup: unused variable removed
...
followup of Bordeaux Optimizer session
2003-12-01 20:53:05 +03:00
pem@mysql.comhem.se
3ed561d3cf
Post-merge fixes.
2003-12-01 18:24:09 +01:00
konstantin@mysql.com
eb27c16d8b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-01 20:23:46 +03:00
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
konstantin@oak.local
2d52be9fdf
don't delete select_lex->having and select_lex->where as we delete
...
all items in free_prep_stmt(free_items);
indentation fix
2003-12-01 17:46:07 +03:00
monty@mysql.com
f266cdabab
Portability fixes (for binary build)
...
Added --protocol to mysqlbinlog
2003-12-01 13:13:16 +02:00
monty@mysql.com
2931e100c1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-28 19:43:30 +02:00
guilhem@mysql.com
398c8de8fa
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1
2003-11-28 16:22:45 +01:00
guilhem@mysql.com
c9fd311aac
In the slave I/O thread (in master.info), it seems less worse to flush
...
the relay log before flushing master.info.
Doing 'before' leads to duplicate event, doing after leads to missing event.
Both can be as destructive, but 'duplicate' enables us to later add detection
code to catch it. Whereas 'missing' can't be caught (it can't, because
the I/O thread can produce legal position jumps, for example if it has
ignored an event coming from this slave (rememember that starting from 4.1.1,
the I/O thread filters the server id).
2003-11-28 16:15:21 +01:00
monty@mysql.com
5914033478
merge with 4.0 to get fix for range bug
2003-11-28 15:55:43 +02:00
monty@mysql.com
4f42a47408
Fixed range optimzier bug (Bug #1828 )
2003-11-28 15:45:34 +02:00
monty@mysql.com
8e613176b5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-28 14:47:33 +02:00
serg@serg.mylan
3b49d34f97
merged
2003-11-28 12:49:58 +01:00
serg@serg.mylan
16e5b4f0ba
bug #1945 . item(expression)->name=0, crash in find_item_in_list
2003-11-28 12:36:45 +01:00
monty@mysql.com
7f9466a717
Merge
2003-11-28 13:31:38 +02:00
monty@mysql.com
6a3e29c865
Fix wrong last edit for last commit
2003-11-28 13:15:42 +02:00
monty@mysql.com
ede8169d24
Added missing SSL library (Should be in source distribution)
...
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
sergefp@mysql.com
82270288de
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0
2003-11-28 00:34:52 +03:00
sergefp@mysql.com
ae15947360
Fix for bug 1974
2003-11-28 00:31:15 +03:00
konstantin@mysql.com
773afc106c
Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
...
into mysql.com:/home/kostja/mysql/mysql-5.0-c
2003-11-27 22:55:56 +03:00
konstantin@oak.local
c75bb0a654
Second attempt: trying to add Statement context to sources.
...
Added classes Statement, Statement_map
Merge commit
2003-11-27 20:51:53 +03:00
konstantin@oak.local
d7b021a308
memory leak (no delete for query= new String) fixed
2003-11-27 19:14:16 +03:00
pem@mysql.comhem.se
d8bf426b80
Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
...
and BUG#1966: "select 1 into a" on top-level hangs client
2003-11-27 16:48:21 +01:00
bell@sanja.is.com.ua
9702a4027d
removed unused variable
2003-11-27 09:34:41 +02:00
konstantin@oak.local
d8603604e8
typo in comment
2003-11-27 00:16:34 +03:00
bell@sanja.is.com.ua
908bc22217
avoiding coping tmptable_param
2003-11-26 20:12:26 +02:00
bell@sanja.is.com.ua
5a7514643f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
2003-11-26 19:13:05 +02:00
bell@sanja.is.com.ua
b633c0ffef
avoiding coping tmp_table_param
2003-11-26 19:10:30 +02:00
guilhem@mysql.com
292b0a1892
Fix for BUG#1960 "date_format() returns spurious '-' for valid dates".
...
It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.
2003-11-26 17:06:24 +01:00
hf@deer.(none)
3e9338f845
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1-w1284
2003-11-26 13:39:18 +04:00
hf@deer.(none)
611096a709
SCRUM
...
WL#1284 (warnings about --skip-name-resolve)
Messages corrected
2003-11-26 13:38:32 +04:00
monty@mysql.com
7733969bf6
Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1
2003-11-26 03:32:39 +02:00
monty@mysql.com
ed6e446225
Added compilation comment to 'show variables'
...
This makes it possible to check origin of binary from the output of 'show variables'
2003-11-26 03:30:00 +02:00