pem@mysql.comhem.se
cbdc0b4c3a
Post-merge fixes.
2003-12-05 14:45:48 +01:00
pem@mysql.com
63f4858030
Merged 4.1 -> 5.0
2003-12-05 13:11:50 +01:00
konstantin@mysql.com
cce3acfa16
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-12-05 01:29:20 +03:00
serg@serg.mylan
cbcb863ca5
test result fixed
2003-12-04 23:18:04 +01:00
bell@sanja.is.com.ua
0ff8c294c0
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1
2003-12-04 23:58:03 +02:00
bell@sanja.is.com.ua
ccb07a4fbb
fixed length of current database name if it is dropped (BUG#1986)
2003-12-04 23:57:10 +02:00
guilhem@mysql.com
c87747c39c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-04 22:44:13 +01:00
guilhem@mysql.com
dd2303ce07
- Fix for BUG#1858 "SQL-Thread stops working when using optimize table":
...
we change THD::system_thread from a 'bool' to a bitmap to be able to
distinguish between delayed-insert threads and slave threads.
- Fix for BUG#1701 "Update from multiple tables" (one line in sql_parse.cc,
plus a new test rpl_multi_update.test). That's just adding an initialization.
2003-12-04 22:42:18 +01:00
konstantin@mysql.com
a8c811e2db
Merge mysql.com:/home/kostja/mysql/mysql-4.0-root
...
into mysql.com:/home/kostja/mysql/mysql-4.0-1790
2003-12-05 00:00:02 +03:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1f02484341
Fixup error number - Broke during merge
2003-12-04 18:09:36 +00:00
monty@mysql.com
e36fd28447
Allow space in service names
...
move bdb/innodb tests to right places
2003-12-04 19:48:10 +02: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
gluh@gluh.mysql.r18.ru
132537accb
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.bugfssl
2003-12-04 14:16:32 +04:00
gluh@gluh.mysql.r18.ru
d626c313e5
Fix for bug#1944 'Function RPad() sometimes produce unexpected result'
2003-12-04 14:12:01 +04:00
sergefp@mysql.com
70ff7b8254
Fix for bug #1980 tests
2003-12-03 19:49:31 +03:00
igor@rurik.mysql.com
31700ed218
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2003-12-02 16:46:06 -08:00
igor@rurik.mysql.com
580b878562
The output of explain command for some queries has changed
...
after introducing Item_equal.
2003-12-02 16:41:53 -08: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
sergefp@mysql.com
801126c60b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/psergey/mysql-4.0
2003-12-02 21:16:57 +03:00
sergefp@mysql.com
486415233e
Fix for bug #1980
2003-12-02 21:05:40 +03:00
dlenev@mysql.com
0add961061
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-tsbg
2003-12-02 20:30:10 +03:00
dlenev@mysql.com
dd37ef055b
Fix for Bug #1448 "Date parsing fails, and fails to complain
...
about it". Now numbers representing illegal timestamps are
converted to 0 value if they are stored as timestamp or
datetime. This behaviour is consistent with manual and with
behaviour of string -> timestamp conversion.
2003-12-02 20:25:45 +03:00
konstantin@mysql.com
cf192063d1
Post-review fixes for bug #1790 'BIT_AND() result in GROUP BY different when
...
SQL_BIG_RESULT used':
- BIT_AND now returns BIGINT UNSIGNED
- in case there were no matching rows BIT_AND returns 18446744073709551615
(but not NULL), BIT_OR returns 0 (but not NULL). That's how Monty wants it
and how is described in our docs.
2003-12-02 19:39: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
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@mysql.com
21b506ba21
Merge mysql.com:/home/kostja/mysql/mysql-4.0-root
...
into mysql.com:/home/kostja/mysql/mysql-4.0-1790
2003-12-02 18:04:00 +03:00
monty@mysql.com
05e4d9031b
Ensure that innodb is created for the first replication test as the slave-timeout is lower for future tests and this failed on some slower machines
2003-12-02 13:32:05 +02:00
igor@rurik.mysql.com
e235d796c9
Merge
2003-12-01 18:47:19 -08:00
igor@rurik.mysql.com
1a9be364dd
range.test:
...
Added tests for != predicate.
sql_select.cc:
Fixing bugs in Item_equal code:
added a parameter in substitute_for_equal_field;
modified eliminate_item_equal.
sql_list.h:
Cleanup
2003-12-01 18:19:31 -08: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
37ad3d2f2d
index_merge.result:
...
Fixed inconsistency of values of used_tables_cache
and const_item_cache for Item_func_isnull objects (bug #1990 ).
2003-12-01 16:15:25 -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
pem@mysql.comhem.se
3ed561d3cf
Post-merge fixes.
2003-12-01 18:24:09 +01:00
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
Sinisa@sinisa.nasamreza.org
168e81d6b6
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-01 13:47:05 +02: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
3ee758497f
Mark position as # to make test portable
2003-11-28 21:05:53 +02:00
serg@serg.mylan
77d137a24a
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 18:18:58 +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
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