msvensson@neptunus.(none)
ddeaf342a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0
patch
2005-06-21 14:19:56 +02:00
igor@rurik.mysql.com
bb944aa9dc
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-1
2005-06-21 04:31:07 -07:00
igor@rurik.mysql.com
2104e9e668
group_by.result, group_by.test:
...
Added a test case for bug #11295 .
item_buff.cc:
Fixed bug #11295 .
This a correction for the patch of bug #11088 that takes into
account a possible NULL values of the BLOB column.
2005-06-21 04:24:21 -07:00
mskold@mysql.com
2716e772d4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-21 10:35:22 +02:00
mskold@mysql.com
981e845d8f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-21 08:59:37 +02:00
marko@hundin.mysql.fi
8934dfaa7b
InnoDB: adjust test result
2005-06-21 08:16:36 +03:00
kent@mysql.com
ff20e1c2ca
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-21 02:27:55 +02:00
kent@mysql.com
4958b54339
mysql-test-run.pl:
...
More compact and safe handling of path names.
Support for running in Windows source tree.
Use libtool wrapper, instead of messing with
library path names, and objects in .libs dir.
mtr_misc.pl:
Utility function that search aand check path names
mtr_report.pl:
Patch by Carsten, set correct reject/result/eval if not main suite
2005-06-21 02:21:52 +02:00
jimw@mysql.com
99e35c84ac
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-20 15:02:45 -07:00
jimw@mysql.com
f36ee2a96d
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 14:48:04 -07:00
kent@mysql.com
9c79bc7e73
Merge
2005-06-20 22:31:25 +02:00
kent@mysql.com
9426710c68
mtr_cases.pl:
...
Bug#11466: Script can now get test case name
from test case file path on command line
mysql-test-run.pl:
Bug#11466: Added --skip-ndbcluster/--skip-ndb option
mtr_cases.pl:
Don't set --default-time-zone if opt file sets it
Restart the server if time zone is given in opt file
mysql-test-run.pl:
Don't remove symlink to "var" directory in cleanup
Removed duplicate/unessesary options to mysqld
2005-06-20 21:37:39 +02:00
jimw@mysql.com
27eace6304
Merge jwinstead@production.mysql.com:my/mysql-4.1-7858
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 12:04:22 -07:00
igor@rurik.mysql.com
28214f3da8
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-20 10:52:38 -07:00
igor@rurik.mysql.com
acc6651d24
group_by.result:
...
Added a test case for bug #11385 .
group_by.test:
Added a test case for bug #11385 .
field.h:
Fixed bug #11385 .
The bug was due to not defined method decimals for the class
Field_datetime.
2005-06-20 10:49:04 -07:00
mskold@mysql.com
91c422e029
Merge
2005-06-20 18:02:47 +02:00
mskold@mysql.com
777ec78755
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-20 16:13:34 +02:00
igor@igor-inspiron.creware.com
7ea12bd787
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into igor-inspiron.creware.com:/home/igor/mysql-4.1
2005-06-20 06:13:30 -07:00
dlenev@mysql.com
e28264d29f
Manual merge of patch for bug#11060 "Server crashes on calling stored
...
procedure with INSERT SELECT UNION SELECT" aka "Server crashes on
re-execution of prepared INSERT ... SELECT with UNION" into 5.0 tree.
2005-06-20 16:58:02 +04:00
dlenev@mysql.com
b5b3b32d0a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg11060
2005-06-20 16:07:36 +04:00
dlenev@brandersnatch.localdomain
d07843efd9
Fix for bug #11060 "Server crashes on re-execution of prepared
...
INSERT ... SELECT with UNION" (reviewed version).
Altough bug manifest itself only starting from 5.0 it is better to
apply fix to 4.1 to keep some assumptions true and make code more
future-proof.
2005-06-20 16:07:00 +04:00
bell@sanja.is.com.ua
02cac1c5e6
fixed time_format printing (BUG#7521)
2005-06-20 14:56:17 +03:00
msvensson@neptunus.(none)
73c1578f15
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug10365
2005-06-20 13:08:45 +02:00
kent@mysql.com
950f36dde6
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-20 12:36:40 +02:00
kent@mysql.com
67a95f5f14
mysql-test-run.pl:
...
Corrected path to 'mysql_fix_privilege_tables'
2005-06-20 12:32:53 +02:00
mskold@mysql.com
598929a109
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-20 12:27:50 +02:00
kent@mysql.com
9a8cb4406e
mysql-test-run.pl:
...
Added --log-bin-trust-routine-creators to server start
Increase and autoextend innodb tables
2005-06-20 12:17:03 +02:00
msvensson@neptunus.(none)
6282d89b0a
bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.
...
- Print warning that says display width is not supported for datatype TIMESTAMP, if user tries to create a TIMESTAMP column with display width.
- Use display width for TIMESTAMP only in type_timestamp test to make sure warning is displayed correctly.
2005-06-20 12:09:00 +02:00
kent@mysql.com
2c1ef9002d
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-20 11:56:19 +02:00
kent@mysql.com
5bf83588e3
mysql-test-run.pl:
...
Corrected path to 'mysql_fix_privilege_tables'
Corrected dummy --manager-port to take integer argument
2005-06-20 11:49:25 +02:00
sergefp@mysql.com
ef85deab92
Fix for BUG#10151: In Item_func_case::find_item don't assume that parameter str != &(this->str_value)
2005-06-20 11:43:38 +02:00
sergefp@mysql.com
5fd19ea864
Fix for BUG#10804: allow differences in rows field in EXPLAIN output
2005-06-20 11:05:38 +02:00
sergefp@mysql.com
014fe01512
Fix for BUG#8441: in index_merge code when creating index search tuples use
...
KEY_PART_INFO::store_length, not KEY_PART_INFO::length (like range code does)
2005-06-20 08:56:37 +00:00
mskold@mysql.com
6fa3cdad5f
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-20 09:37:31 +02:00
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
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
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