tomas@poseidon.ndb.mysql.com
900e507b14
fixed so that warning on missing support for engine only printed once even if option given multiple times
2004-11-30 20:51:57 +00:00
tomas@poseidon.ndb.mysql.com
aec0b4e4d7
fixed error in test result
...
added extra calls to retrieve connectstring used
reengineered connect somewhat to make retries etc explicit
2004-11-30 17:47:47 +00:00
marko@hundin.mysql.fi
97406b377c
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 17:48:30 +02:00
tomas@poseidon.ndb.mysql.com
922c9146cd
use sql_print_warning instead of push_warning in mysqld.cc
2004-11-30 15:48:29 +00:00
marko@hundin.mysql.fi
a35a93aa3c
InnoDB: Allow ALTER TABLE to do intermediate COMMIT also when the table
...
contains auto_increment columns. (Bug #6633 )
2004-11-30 17:34:37 +02:00
tomas@poseidon.ndb.mysql.com
2d1458ea5b
mysqld.cc:
...
fixed erroneous previous push
2004-11-30 14:52:05 +00:00
tomas@poseidon.ndb.mysql.com
559f33b2e2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-30 12:17:21 +00:00
ram@gw.mysql.r18.ru
c15b45df50
Portability fix. Why not to use UINT_MAX32 here?
2004-11-30 15:10:48 +04:00
tomas@poseidon.ndb.mysql.com
d209371a46
mysqld.cc:
...
fixed typo
2004-11-30 10:22:50 +00:00
tomas@poseidon.ndb.mysql.com
91aec87086
add warnings for INNODB,BDB,ISAM being unavailable if switch to use is supplied, i.e. --bdb,--isam,--innodb
2004-11-30 09:22:33 +00:00
tomas@poseidon.ndb.mysql.com
2d5711b8d5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-30 08:41:59 +00:00
tomas@poseidon.ndb.mysql.com
f3e201886a
added use of mysql_cluster in mysqld (e.g. for ndb-connectstring)
...
added warning printout if --ndbcluster switch is given in a "non-cluster" binary
2004-11-30 08:41:16 +00:00
joreland@mysql.com
4ba04a3d6e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-30 07:44:11 +01:00
joreland@mysql.com
e86ce67ea5
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402
ndb - fixed long overdue problems with unique indexes and null values
2004-11-30 07:41:26 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
b09068f8a4
Applied some Netware related patches.
2004-11-29 17:41:47 +02:00
serg@serg.mylan
96729c62be
merged
2004-11-28 18:19:01 +01:00
marko@hundin.mysql.fi
2e7cb4d011
InnoDB: Make intermediate COMMITs in ALTER TABLE more robust (Bug #6633 )
2004-11-27 00:45:01 +02:00
monty@mysql.com
eb304bd49f
Fixes while reviewing code
...
(Cleanups and better bug fixes)
2004-11-26 02:31:22 +02:00
heikki@hundin.mysql.fi
14b60dfce4
ha_innodb.cc:
...
Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error
2004-11-26 00:26:35 +02:00
mats@mysql.com
4ac392fa45
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/bkroot/mysql-4.1
2004-11-25 13:35:53 +01:00
ram@gw.mysql.r18.ru
886d54bb37
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:48 +04:00
bar@mysql.com
3d6e811ed5
table.cc:
...
Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
2004-11-25 16:18:47 +04:00
ram@gw.mysql.r18.ru
511eb626bf
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
2004-11-25 16:18:46 +04:00
timour@mysql.com
f1e86036ee
Merge mysql.com:/home/timka/mysql/src/4.0-virgin
...
into mysql.com:/home/timka/mysql/src/4.0-master
2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c
Merge
2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be
Merge for BUG#3759 which was missing from the main tree for some reason.
2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e
Merge mysql.com:/space/bkroot/mysql-4.0
...
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55
Fix for Bug#6148. Only rewind read position in binary log when the
...
slave SQL thread is started.
2004-11-25 09:26:45 +01:00
joreland@mysql.com
fab3038dff
Merge mysql.com:/home/jonas/src/wl2077
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-24 11:59:06 +01:00
wax@mysql.com
332269903b
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1bug
2004-11-23 17:58:46 +05:00
wax@kishkin.ru
cfb82e9ef7
rename event_connect_request to smem_event_connect_request
2004-11-23 17:55:07 +05:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
076f27147f
Bug#6252 - Duplicate columns in keys should fail
...
Added check for duplicate column in key
Added tests and fixed tests which exploit bug
2004-11-22 18:07:04 +00:00
tomas@poseidon.ndb.mysql.com
2e63f22a71
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
2004-11-22 15:53:06 +00:00
serg@serg.mylan
44926664a5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-22 14:55:20 +01:00
serg@serg.mylan
41c33c29a3
Bug #6748 heap_rfirst() doesn't work (and never did!)
...
range for BETWEEN typo fixed
2004-11-22 14:53:18 +01:00
tomas@poseidon.ndb.mysql.com
1d981111e0
added force send interface to scan
...
prepared for using query cache in ndb
2004-11-22 13:41:46 +00:00
mskold@mysql.com
3455e345b2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-11-22 12:02:32 +01:00
dlenev@mysql.com
64cd633f43
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
2004-11-22 13:06:31 +03:00
dlenev@brandersnatch.localdomain
c37977c87d
Fix for bug #6462 "Same request on same data returns different
...
results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
statements". (Version #2 with after-review fixes).
To perform proper cleanup for statements that can contain subqueries
but don't have main select we must call free_undelaid_joins().
2004-11-22 13:05:10 +03:00
mskold@mysql.com
f0e95c3704
Added checks for NOT NULL for all fields in UNIQUE INDEX (USING HASH)
2004-11-22 10:35:03 +01:00
bar@mysql.com
e3b94d4ef5
Bug #6737 : REGEXP gives wrong result with case sensitive collation:
...
- A new flag MY_CS_CSSORT was introduced for case sensitivity.
- Item_func_regexp doesn't substiture ICASE not only
for binary collations but for case sensitive collations as well.
2004-11-22 11:58:40 +04:00
konstantin@mysql.com
6337ea8a40
A fix and test case for Bug#6297 "prepared statement, wrong handling
...
of <parameter> IS NULL":
we must not only set Item::null_value in Item_param, but implement
Item_param::is_null() to work well with IS NULL/IS NOT NULL clauses.
2004-11-21 12:04:27 +03:00
dlenev@mysql.com
4e52cc2ded
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6266
2004-11-19 21:51:37 +03:00
dlenev@mysql.com
aaee135243
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
2004-11-19 21:38:51 +03:00
dlenev@mysql.com
5627dddb93
Manual merge of fix for bug #6439 "from_unixtime() function returns
...
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
2004-11-19 19:19:45 +03:00
dlenev@mysql.com
cb7e272e46
Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled
...
properly" with main tree.
2004-11-19 18:35:36 +03:00
bar@mysql.com
770c9be8c2
Bug #6658 MAX(column) returns incorrect coercibility
...
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.
2004-11-19 19:35:36 +04:00
dlenev@mysql.com
40083741ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
2004-11-19 17:54:14 +03:00
tomas@poseidon.ndb.mysql.com
fdfc731155
ha_ndbcluster.cc:
...
merge error
2004-11-19 09:27:16 +00:00