mwagner@mysql.com
2e0d1b3f9c
openssl_1.result, have_openssl_1.require, openssl_1.test:
...
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
2004-12-01 02:35:02 +01:00
guilhem@mysql.com
5caa586d56
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-30 22:50:40 +01:00
guilhem@mysql.com
81609d6e1c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-30 22:22:12 +01:00
guilhem@mysql.com
7219d2be90
two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever"
...
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.
2004-11-30 22:20:52 +01:00
tsmith@build.mysql.com
075a887995
mysqld_safe.sh:
...
Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option.
NOTE: this may make some installations behave differently, if they depend on this broken behavior.
2004-11-30 22:17:43 +01:00
marko@hundin.mysql.fi
ef2a73783e
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 23:12:12 +02:00
marko@hundin.mysql.fi
2cb2461229
lock0lock.h:
...
Rename lock_table_exclusive to lock_is_table_exclusive
(somehow this change was omitted from last changeset)
2004-11-30 23:10:17 +02:00
serg@serg.mylan
7a74b75945
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-30 21:51:58 +01:00
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
serg@serg.mylan
8551a482e2
typo fixed
2004-11-30 21:17:03 +01: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
d365446f62
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:52:30 +02:00
heikki@hundin.mysql.fi
12738cd23a
lock0lock.c:
...
If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
2004-11-30 17:51:10 +02:00
marko@hundin.mysql.fi
b8028e6a0d
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:50:56 +02:00
heikki@hundin.mysql.fi
c7ed52456d
row0sel.c:
...
Remove compiler warning as I had forgotten an include file
2004-11-30 17:48:30 +02: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
abb50b38ee
ps_7ndb.result, ps_7ndb.test:
...
ndb now runs ps tests just like the others
2004-11-30 15:08:26 +00: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
tomas@poseidon.ndb.mysql.com
e5d03d1b7c
added check connection mgmapi method
...
added ndb_mgm_check_connection when error is printed
2004-11-30 12:02:53 +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
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
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
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
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
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
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
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
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
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
cb538e45f5
post-merge fix
2004-11-28 19:48:41 +01:00
serg@serg.mylan
96729c62be
merged
2004-11-28 18:19:01 +01:00
serg@serg.mylan
989721d12f
bad merge fixed
2004-11-28 17:06:40 +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