msvensson@neptunus.(none)
891b64fd84
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 12:16:59 +02:00
jimw@mysql.com
59f5252dc9
Merge mysql.com:/home/jimw/my/mysql-4.1-10435
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-09 02:30:25 -07:00
msvensson@neptunus.(none)
34cec09efb
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:26:48 +02:00
msvensson@neptunus.(none)
670eef8756
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 11:23:12 +02:00
dlenev@mysql.com
12621f349b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg9913
2005-05-09 12:18:19 +04:00
ramil@ram-book.(none)
1092c4d8b4
Fix for bug #9798 : Rollup crash with InnoDB in setup_sum_funcs().
2005-05-09 11:43:52 +05:00
bell@book.sanja.is.com.ua
aab64322a2
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-bug-5.0
2005-05-09 09:35:16 +03:00
bell@book.sanja.is.com.ua
4c984c7cc6
merge
2005-05-09 02:06:18 +03:00
bell@book.sanja.is.com.ua
91dccaa36f
Item::fix_field need correct pointer on item reference to chnge it if itis need, so support of correct item address added to SP commands (BUG#5963)
...
some optimisation of IF/NOT IF ptomised to Pem
2005-05-09 01:59:10 +03:00
antony@ltantony.mysql.com
714994e3e6
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
2005-05-08 23:24:33 +01:00
antony@ltantony.mysql.com
10b460e780
Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug8191
...
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.0
2005-05-08 23:07:46 +01:00
antony@ltantony.mysql.com
b6609031fa
Bug#8191 - SELECT INTO OUTFILE insists on FROM clause
...
Fix bug + include test case.
Enable outfile tests.
2005-05-08 22:56:58 +01:00
mskold@mysql.com
9e1117c3e5
Merge
2005-05-08 22:52:55 +02:00
mskold@mysql.com
c216278ab2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-08 22:46:09 +02:00
mskold@mysql.com
66f881a8f6
Removed call to cond_push for empty cond
2005-05-08 22:42:40 +02:00
mskold@mysql.com
6f38bd937e
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-05-08 22:25:38 +02:00
antony@ltantony.mysql.com
d51308aec4
Bug#6236
...
Incomplete ALTER TABLE breaks MERGE compatibility
Fix implicit NOT NULL not set on ALTER of PK columns
2005-05-08 21:03:50 +01:00
mwagner@ultrafly.mysql.com
8945bb5d1d
Merge bk-internal:/home/bk/mysql-4.1
...
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1
2005-05-08 19:16:37 +02:00
mwagner@ultrafly.mysql.com
b0774772d9
errmsg.txt:
...
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195 ).
2005-05-08 19:14:28 +02:00
jimw@mysql.com
d1a745b0ba
Add special error message for .frm files with an un-understood version, like
...
those from 5.0 with new datatypes. (Bug #10435 )
2005-05-07 13:57:22 -07:00
mskold@mysql.com
bea71274f7
Merge
2005-05-07 22:49:04 +02:00
mskold@mysql.com
89d8290eb3
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-05-07 22:48:16 +02:00
mskold@mysql.com
a785052d7d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-07 22:44:49 +02:00
mskold@mysql.com
1eaa54a4d8
Removed double cond_push
2005-05-07 22:41:30 +02:00
mwagner@ultrafly.mysql.com
9f92bd5e25
Merge bk-internal:/home/bk/mysql-4.0
...
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.0
2005-05-07 22:08:05 +02:00
mskold@mysql.com
cb8d2905aa
bug#9813: Post review fixes
2005-05-07 22:04:52 +02:00
lenz@mysql.com
f09fc52bc4
- Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" instead of
...
#include <mysql_priv.h>
2005-05-07 22:04:10 +02:00
svoj@mysql.com
f0841a2771
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/7709-mysql-4.0
2005-05-07 21:39:29 +05:00
antony@ltantony.mysql.com
4fe845e8d0
Merge
2005-05-07 16:50:22 +01:00
gbichot@quadita2.mysql.com
a85ecdb670
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-07 17:26:01 +02:00
jimw@mysql.com
b4dcd8f4ab
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-07 08:26:00 -07:00
holyfoot@hf-ibm.(none)
a16a207456
Fix for embedded server to compile
2005-05-07 20:25:59 +05:00
jimw@mysql.com
80933d9f95
Merge
2005-05-07 08:25:58 -07:00
gluh@mysql.com
3ce315ce33
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10261
2005-05-07 15:25:57 +00:00
gluh@mysql.com
f6bf2680b2
Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
...
I_S table columns information is available for any user
2005-05-07 15:14:34 +00:00
antony@ltantony.mysql.com
fa8673a627
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
2005-05-07 14:55:49 +01:00
jimw@mysql.com
d398b6eb51
Add support for slave_compressed_protocol, slave_load_tmpdir, and
...
slave_skip_errors in SHOW VARIABLES. (Bug #7800 )
2005-05-07 06:55:47 -07:00
gluh@mysql.com
64cbbf1463
Fix for bug #9838 : INFORMATION_SCHEMA.COLUMNS columns of granted views missing
2005-05-07 13:55:46 +00:00
antony@ltantony.mysql.com
a5e9523364
Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666
...
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
2005-05-07 14:46:54 +01:00
antony@ltantony.mysql.com
687417be74
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725
...
into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1
2005-05-07 14:43:03 +01:00
mwagner@ultrafly.mysql.com
ded73eddf7
errmsg.txt:
...
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195 ).
2005-05-07 15:11:31 +02:00
antony@ltantony.mysql.com
1af671bf36
Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool
...
Fix bug by moving TRUE/FALSE in with other literals.
2005-05-07 13:51:29 +01:00
antony@ltantony.mysql.com
1ebc9e37ea
Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"
...
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
Fix so that protocol doesn't break by properly ignoring dups.
2005-05-07 13:31:37 +01:00
antony@ltantony.mysql.com
06954a4f8b
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
2005-05-07 13:21:49 +01:00
gluh@mysql.com
a8febcd7d2
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9897
2005-05-07 12:21:48 +00:00
gluh@mysql.com
d76be7ab3f
Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
...
thd->lex->derived_tables should be zero(it may be changed if we open a view)
2005-05-07 12:17:54 +00:00
svoj@mysql.com
c7f0fcab23
BUG#7709 fix - Boolean fulltext query against unsupported engines does not
...
fail.
2005-05-07 15:48:56 +05:00
gbichot@production.mysql.com
a1948f769c
[backport of 4.1, because 4.0 autobuild now hits the same problem;
...
when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.
2005-05-07 11:35:14 +02:00
jimw@mysql.com
ef183de687
Merge mysql.com:/home/jimw/my/mysql-4.1-8497
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:00:24 -07:00
antony@ltantony.mysql.com
521b0b6d76
Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1
...
into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-5.0
2005-05-07 08:46:42 +01:00