hf@deer.(none)
7f7e7ff648
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-11-30 15:07:37 +04:00
brian@avenger.(none)
0285686fd8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into avenger.(none):/export/brian/mysql/archive-delayed
2004-11-30 03:01:39 -08:00
brian@avenger.(none)
e6f038eacf
Changes to support optimized bulk inserts. This will solve the problem of selects occurring during a bulk insert, and causing the compression factor to drop.
2004-11-30 02:52:14 -08:00
tomas@poseidon.ndb.mysql.com
d209371a46
mysqld.cc:
...
fixed typo
2004-11-30 10:22:50 +00:00
tomas@poseidon.ndb.mysql.com
d437a56bad
fixed bug/compiler warning
...
rewrote safer
added return value to shutdown
nicer printouts
removed exit at shutdown
2004-11-30 10:19:49 +00:00
jan@hundin.mysql.fi
fb50b9e63c
Auto merged.
2004-11-30 12:11:02 +02:00
jan@hundin.mysql.fi
97f59719b6
Added support for X/Open XA prepare, recover, commit and rollback.
2004-11-30 11:45:02 +02: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
ram@gw.mysql.r18.ru
3f741570e9
An additional test for 'CREATE DATABASE' with non-default character set.
2004-11-30 13:19:35 +04: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
ram@gw.mysql.r18.ru
0ca8fd2ee9
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
2004-11-30 12:27:17 +04:00
joreland@mysql.com
a1a4ddad74
ndb - Fixed INCORRECT result file for unique index test
2004-11-30 08:42:42 +01:00
joreland@mysql.com
634a1362e8
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:46:52 +01:00
joreland@mysql.com
85f8ad7bd1
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:45:49 +01: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
brian@avenger.(none)
86c57bd8c2
Merge
2004-11-29 20:15:48 -08:00
tsmith@build.mysql.com
c02e81b018
Merge
2004-11-30 03:24:17 +01:00
tsmith@build.mysql.com
6968523df1
mysqldump.c:
...
minor cleanup to the --order-by-primary feature code
2004-11-30 02:26:24 +01:00
serg@serg.mylan
4e2a9c6905
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-29 22:49:00 +01:00
serg@serg.mylan
ceb0d1cf87
compatibility fixes
2004-11-29 22:47:50 +01:00
paul@kite-hub.kitebird.com
57cd047ca3
monty.doc:
...
Grammar fix.
user.r:
A few typo fixes.
2004-11-29 13:26:12 -06:00
tomas@poseidon.ndb.mysql.com
ee70c9a501
ndb_grant.later:
...
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
2004-11-29 17:46:32 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
57b30a1eef
Applied some patches for Netware.
2004-11-29 18:32:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b09068f8a4
Applied some Netware related patches.
2004-11-29 17:41:47 +02:00
tomas@poseidon.ndb.mysql.com
07417cd309
NdbScanOperation.cpp:
...
added missing return
2004-11-29 15:36:43 +00:00
tomas@poseidon.ndb.mysql.com
08a84bebaf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-29 15:19:08 +00:00
tomas@poseidon.ndb.mysql.com
b11f3feb53
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
...
added new error type "configuration or application error"
Added check if backup is issued during diskless mode, backup refuse returned
added possibility to get error code as a result from management client
addded possibility to set connecstring with CONNECT command
changed to use strcasecmp instead of strcmp
added possibility to run one command on cammand client to ndb_mgm and get an errorcode of command fails
made thread safe veriosn of getErrorText in management server
aligned backup errorcodes with rest of ndb error codes giving it range from 1300
print error message from regular ndberror struct
added new arrer type "cofiguration or application error"
commented on allocaded ranges for errors
2004-11-29 15:14:43 +00:00
hf@deer.(none)
9d42bd4d54
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-11-29 14:59:49 +04:00
brian@avenger.(none)
15735b241f
Adding support for archive to handle delayed inserts.
2004-11-29 01:40:25 -08:00
mats@mysql.com
fed6019856
Merge mysql.com:/space/bkroot/mysql-4.1
...
into mysql.com:/space/bk/b6148-mysql-4.1
2004-11-29 10:25:58 +01:00
mats@mysql.com
05d38dfcd8
rpl_start_stop_slave.result:
...
Syntax change between 4.0 and 4.1.
2004-11-29 10:24:40 +01:00
joreland@mysql.com
2aa77fdaae
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-29 09:28:23 +01:00
joreland@mysql.com
23c5feeeb4
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-29 09:24:20 +01:00
joreland@mysql.com
208050f63f
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-29 09:17:45 +01:00
tomas@poseidon.ndb.mysql.com
5e799e4a3b
ndb_grant.later:
...
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
2004-11-29 08:06:53 +00:00
joreland@mysql.com
74bfe72d3d
ndb - scan bug fix + more test cases
2004-11-29 09:00:39 +01:00
serg@serg.mylan
5ce151891a
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-28 21:56:43 +01:00
serg@serg.mylan
5a07b871cc
don't cast LEX_STRING to char* :)
2004-11-28 21:55:38 +01:00
serg@serg.mylan
b460059988
merged
2004-11-28 20:42:04 +01:00
serg@serg.mylan
cb538e45f5
post-merge fix
2004-11-28 19:48:41 +01:00
sergefp@mysql.com
10fda3160c
Fix for division by zero problem:
...
* Don't try building ROR-intersect if the queried table has zero rows
* Don't ever produce an estimate of zero returned rows.
2004-11-28 21:02:30 +03:00
serg@serg.mylan
96729c62be
merged
2004-11-28 18:19:01 +01:00
serg@serg.mylan
800ffc6150
view.test:
...
more max_rows for show table status
comment spellchecking...
2004-11-28 18:00:42 +01:00
serg@serg.mylan
992f5c70dd
limit Max_data_length in 'show table status'
2004-11-28 17:30:52 +01:00
serg@serg.mylan
989721d12f
bad merge fixed
2004-11-28 17:06:40 +01:00
serg@serg.mylan
e731dd9d05
fix for decimal.c
2004-11-28 16:58:05 +01:00
serg@serg.mylan
1a32157950
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-28 16:32:01 +01:00
