kent@mysql.com
e58054ad16
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-19 20:09:28 +02:00
kent@mysql.com
917276f254
mysql-test-run.pl:
...
Added dummy --manager-port flag, for backward compatibility
Back port from 5.0, correction of paths to SSL pem files
mtr_cases.pl:
Removed hard coded exclude list for embedded server
mysql-test-run.pl:
Set environment variable MYSQL_SHOW, to be used in test cases
2005-06-19 20:06:27 +02:00
kent@mysql.com
32734072d0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-19 18:55:00 +02:00
gbichot@quadita2.mysql.com
c2ec0e7409
correcting error messages after discussion with Paul (replication of routines).
2005-06-19 17:39:08 +02:00
bell@sanja.is.com.ua
d75f6d74b5
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-06-18 20:11:41 +03:00
serg@serg.mylan
3812e15c00
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-06-18 18:16:04 +02:00
serg@serg.mylan
07513c001c
BSD make compatibility. bug#9828
2005-06-18 18:14:28 +02:00
jimw@mysql.com
01c690b79b
Fix information_schema test on Windows. (Bug #10844 )
2005-06-18 03:02:27 +02:00
acurtis@xiphis.org
51dd521dfc
Bug#6877 MySQL should give an error if the requested table type is not available
...
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
2005-06-17 22:14:44 +01:00
jimw@mysql.com
176143413e
Fix hang/crash with Boolean full-text search against an unindexed field for
...
which the query contained more words than we allocated space. (Bug #7858 )
2005-06-17 21:44:17 +02:00
bell@sanja.is.com.ua
6d030c637b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
2005-06-17 20:30:11 +03:00
msvensson@neptunus.(none)
daba295db0
BUG#10589: des_encrypt functionality always return NULL
...
- Push warnings if des_encrypt or des_descrypt function fails because of out of resources or wrong params.
- Push warning if des_encrypt or des_decrypt function is used when server is missing support for openssl.
- Add test func_encrypt_nossl that is tun when the server is missing support for openssl.
2005-06-17 18:07:46 +02:00
jimw@mysql.com
ec54dcb054
Fix spurious permissions problem when CONVERT_TZ() is used
...
in a multi-table update query. (Bug #9979 )
2005-06-17 08:56:04 -07:00
elliot@mysql.com
0c71508759
BUG#10442 Fix replication slave crash when a query with multiupdate and
...
subselects is used.
2005-06-17 11:15:29 -04:00
bell@sanja.is.com.ua
a11677026f
fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387)
2005-06-17 17:27:47 +03:00
mskold@mysql.com
dc5e1444a0
Fix for bug#10936: Cluster engine shows wrong key value for duplicate key error
2005-06-17 14:45:54 +02:00
lars@mysql.com
41d1c094b6
Fix of 5.0 tree
2005-06-17 14:03:27 +02:00
igor@rurik.mysql.com
dd782a8746
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-17 03:56:24 -07:00
konstantin@mysql.com
62dacf0813
Manual merge (4.1->5.0)
2005-06-17 00:34:35 +04:00
konstantin@mysql.com
dcb0e65dcb
Fix Bug#9334 "PS API queries in log file" and
...
Bug#8367 "low log doesn't gives complete information about prepared
statements"
Implement status variables for prepared statements commands (a port of
the patch by Andrey Hristov).
See details in comments to the changed files.
No test case as there is no way to test slow log/general log in
mysqltest.
2005-06-17 00:11:48 +04:00
igor@rurik.mysql.com
ad223c9c10
group_by.result, group_by.test:
...
Correction after merge of fix for bug #8614 .
2005-06-16 11:59:00 -07:00
igor@rurik.mysql.com
86a314cc7b
Manual merge
2005-06-16 10:04:41 -07:00
igor@rurik.mysql.com
deaf7f9608
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-16 09:49:04 -07:00
igor@rurik.mysql.com
2095758a9d
group_by.result, group_by.test:
...
Added a test case for bug #8614 .
sql_select.cc:
Fixed bug #8614 .
SELECT DISTINCT ... GROUP BY 'const' must be equivalent to
SELECT ... GROUP BY 'const'.
2005-06-16 09:45:41 -07:00
joerg@mysql.com
f0caf7d58c
Merge mysql.com:/M50/clone-5.0.7 into mysql.com:/M50/mysql-5.0
2005-06-16 18:30:19 +02:00
matthias@three.local.lan
a785b84ea1
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B
2005-06-16 17:37:04 +02:00
timour@mysql.com
64df4e1170
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-06-16 18:11:35 +03:00
timour@mysql.com
375e79bb6e
Post-fix for BUG#11211
...
Exclude the query that generates warning from PS tests, due to extra warning
under PS.
2005-06-16 18:03:51 +03:00
lars@mysql.com
869882f321
WL#2076: Added if(...) construct to mysqltest
...
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
2005-06-16 16:56:03 +02:00
mleich@mysql.com
2e732594bc
Post review fixes
2005-06-16 12:46:09 +02:00
matthias@three.local.lan
e0bd604c92
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-B
2005-06-16 12:10:06 +02:00
gluh@mysql.com
a68bfdc334
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-06-16 13:30:14 +05:00
gluh@eagle.intranet.mysql.r18.ru
c7dde629b7
Fix for bug#9434 SHOW CREATE DATABASE information_schema;
...
added ability to do SHOW CREATE DATABASE `information_schema`
2005-06-16 13:27:22 +05:00
serg@serg.mylan
b49bb72b7a
fix test results - Bug #11328
2005-06-16 10:09:05 +02:00
ramil@mysql.com
d2b54e0a87
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-06-16 12:45:22 +05:00
ramil@mysql.com
22646589b6
a fix (bug #10650 : Bit literal case sensitivity).
2005-06-16 12:17:15 +05:00
gluh@eagle.intranet.mysql.r18.ru
a851311d77
Fix for bug#11055: information_schema: routines.sql_data_access has wrong value
2005-06-16 12:12:47 +05:00
jimw@mysql.com
9b166de236
Fix SHOW CREATE VIEW to handle ANSI_QUOTES mode. (Bug #6903 )
2005-06-15 16:27:41 -07:00
mleich@mysql.com
2545d83f31
Improvement of the auxiliary routines include/show_msg*.inc
...
- replace @message by $message
--> The annoying protocol line "SET @message= <value>" will disappear.
- extended description
- some examples added
2005-06-15 19:16:17 +02:00
igor@rurik.mysql.com
ff0b7e4d73
Manual merge
2005-06-15 08:39:00 -07:00
igor@rurik.mysql.com
316815f44e
cast.result, cast.test:
...
Added test case for bug #11283 .
field.h, field.cc:
Fixed bug #11283 : wrong conversion from varchar to decimal.
Added methods Field_string::val_decimal,
Field_varstring::val_decimal, Field_blob::val_decimal.
They are not inherited from the base class Field_longstr
anymore.
2005-06-15 08:27:33 -07:00
hf@deer.(none)
38aa20d380
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.10632
2005-06-15 19:56:01 +05:00
hf@deer.(none)
f1fb785b12
Fix for bug #10632 (CEILING returns wrong result)
2005-06-15 19:53:40 +05:00
hf@deer.(none)
f7cccd7ea8
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.10337
2005-06-15 19:07:11 +05:00
hf@deer.(none)
971eaa189d
Fix for bug #10337 (cast(NULL DECIMAL) crashes the server)
2005-06-15 19:02:35 +05:00
mskold@mysql.com
51eb697fc0
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 15:02:48 +02:00
igor@rurik.mysql.com
4bfe1cc843
join_nested.result, join_nested.test:
...
Added a teast case for bug #11284 .
sql_select.cc:
Fixed bug #11284 .
Optimization with empty inner table currently cannot be
used in the case of nested outer join.
2005-06-15 05:56:19 -07:00
mskold@mysql.com
7ce515d403
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 13:32:41 +02:00
igor@rurik.mysql.com
aeb5ab5d4c
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-15 03:39:43 -07:00
igor@rurik.mysql.com
46325044d0
join_outer.result, join_outer.test:
...
Added a test case for bug #11285 .
sql_select.cc:
Fixed bug #11285 .
The problem occurred with Item_equal in an 'on expression'
that was evaluated to false.
2005-06-15 02:02:25 -07:00