lenz@mysql.com
acbfb38c02
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-06-21 10:37:29 +02: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
marko@hundin.mysql.fi
e992adcb3f
Merge hundin.mysql.fi:/home/marko/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-06-21 07:36:18 +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
kent@mysql.com
c7e501d883
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-20 21:25:54 +02:00
jimw@mysql.com
4d6c8d59a9
Merge jwinstead@production.mysql.com:my/mysql-4.1-win
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 12:07:41 -07:00
jimw@mysql.com
60aef4ba97
Merge jwinstead@production.mysql.com:my/mysql-4.1-10840
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-20 12:05:09 -07: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
jimw@mysql.com
5381e18673
Fix handling of command-line on Windows, missed as part of earlier
...
commit. (Bug #10840 )
2005-06-20 18:54:45 +02:00
kent@mysql.com
fb09633eb1
Makefile.am:
...
Corrected dependency for "lex_hash.h", to avoid occasional make failure
2005-06-20 18:03:30 +02:00
mskold@mysql.com
91c422e029
Merge
2005-06-20 18:02:47 +02:00
mskold@mysql.com
d34fce5bf6
ha_ndbcluster.cc:
...
Added CR for readability
2005-06-20 17:17:44 +02:00
mskold@mysql.com
e8e6554a22
Added comment to store_lock
2005-06-20 17:16:22 +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
konstantin@mysql.com
b875f7902d
Fix a formatting bug and add a test for it.
2005-06-20 15:38:15 +04:00
kent@mysql.com
43f8b7b43b
Merge
2005-06-20 13:20:27 +02:00
lenz@mysql.com
1abd960ee5
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-06-20 13:18:48 +02: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
27e9a70379
Makefile.am:
...
Use the Perl version of mysql-test-run
2005-06-20 12:58:58 +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)
8aaad90786
BUG#10466 Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.
...
- Use buffer for printing error message
2005-06-20 12:11:52 +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
marko@hundin.mysql.fi
f70798884c
InnoDB: Remove warnings detected by GCC 4.0.0
2005-06-20 11:06:20 +03: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
svoj@mysql.com
c45df76029
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-20 11:33:57 +05:00
tulin@dl145c.mysql.com
e4fe710974
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-06-20 08:28:45 +02:00
lenz@mysql.com
eee70ec1c3
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-06-20 08:11:07 +02:00
tulin@dl145c.mysql.com
2d654a5551
Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-06-20 07:57:09 +02:00