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
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
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
tulin@dl145c.mysql.com
61c36b1c12
ha_ndbcluster.cc:
...
remove typecheck in ndb handler not needed
2005-06-20 07:53:53 +02:00
stewart@mysql.com
ef5ca97f6b
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-06-20 15:32:53 +10:00
stewart@mysql.com
c4066adafd
BUG#11377 Building cluster in 4.1 BK tree fails with GCC4.0
2005-06-20 15:18:53 +10: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
svoj@mysql.com
7660f609e6
WL#2286 - Compile MySQL w/YASSL support
...
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.
Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
2005-06-19 21:46:44 +05:00
gbichot@quadita2.mysql.com
63a351ea4f
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-06-19 17:40:39 +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
konstantin@mysql.com
82f3120541
Rewrite the test for Bug#9992.
2005-06-19 17:31:20 +04:00
konstantin@mysql.com
021c2d45cb
Fix the test for Bug#11111: coding style, a compiler warning, don't
...
use tabs.
2005-06-19 17:02:31 +04: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
07892fe219
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into xiphis.org:/usr/home/antony/work2/p3-bug6877.3
2005-06-17 22:32:46 +01: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
bell@sanja.is.com.ua
640027f7ba
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 23:53:51 +03:00