Commit graph

966 commits

Author SHA1 Message Date
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
joreland@bk-internal.mysql.com
c3eb3c0a62 ndb - run full mysql-test-run in autotest 2004-12-22 09:01:49 +01:00
jon@gigan.
4b881691af Changes in config for generation of NDB API docs:
don't include header files or class private members;
do include class static members.
2004-12-21 20:52:52 +10:00
marty@shark.
9f8fb94a81 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into shark.:/home/marty/MySQL/mysql-5.0-ndb
2004-12-20 14:02:42 +01:00
mysqldev@bk-internal.mysql.com
2370f9da7f Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
2004-12-20 13:34:25 +01:00
marty@shark.
2cf2f2bd07 logging_ok:
Logging to logging@openlogging.org accepted
compile-amd64-max, compile-amd64-debug-max:
  new file
2004-12-20 13:32:02 +01:00
paul@frost.snake.net
adfb20f64a fill_help_tables.sh:
Convert @samp{c} to 'c', not c.
2004-12-18 14:22:20 -06:00
joreland@mysql.com
652a29711b merge 2004-12-18 11:49:15 +01:00
joreland@mysql.com
9184b05435 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-18 11:49:14 +01:00
matt@booty.(none)
35942c09de my-innodb-heavy-4G.cnf.sh:
I fixed the typos in the transaction-isolation comments.
  I fixed the spelling mistakes in the comment.  It had tripped up a support 
  customer as they couldn't start the server with transaction-isolation=
  read-commited
2004-12-17 22:25:35 -05:00
mysqldev@bk-internal.mysql.com
e4da7f4a40 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-4.1-cluster-extra
2004-12-17 11:46:44 +01:00
joreland@mysql.com
cfa20fbaa6 merge 2004-12-17 10:36:14 +01:00
joreland@mysql.com
5fe332db5e merge 2004-12-16 22:42:27 +01:00
joreland@mysql.com
59536a0043 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-16 22:23:34 +01:00
joreland@mysql.com
0ca5b5637e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-16 22:22:18 +01:00
ndbdev@shark.
d3a8f6b9bd don't compile instance-manager by default, as it never compiles 2004-12-15 09:14:19 +01:00
kaa@polly.local
2ce0ad6d7e Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0 2004-12-14 22:26:31 +03:00
anjuta@arthur.local
f9451974be WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
stewart@mysql.com
57d5d6c09e Remove dead code 2004-12-08 20:13:33 +11:00
joreland@mysql.com
50e15affff Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl1744
2004-12-06 14:52:31 +01:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
stewart@mysql.com[stewart]
00915656e7 Add (optional) endian parameter to 'get nodeid' to warn on endian conflicts. 2004-12-06 11:41:16 +11:00
jimw@mysql.com
4b8e96d5ca Merge 2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)
2004-12-03 00:05:11 +01:00
mwagner@mysql.com
d6efb4bbfd configure.in:
Incremented for next version
2004-12-02 07:24:08 +01:00
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
tomas@poseidon.ndb.mysql.com
97c8234b46 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-26 13:44:49 +00: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
petr@mysql.com
edc868e397 Added --disable-log-bin option to the mysqlbinlog (WL1787) 2004-11-19 18:35:36 +03:00
timour@mysql.com
5d1f920ba7 correct name of function in synopsis 2004-11-18 16:52:45 +02:00
joreland@mysql.com
f63b126f7e Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744
2004-11-15 10:50:58 +01:00
patg@patrick-galbraiths-computer.local
7df412160a Needed for WL# 2094, MySQL Federated Storage Handler
sql_string.h:
  simple string method to drop last character of a string (also decrements str_length)
2004-11-12 15:56:25 -08:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
Administrator@w2k.
414298f38b Merge joreland@bk-internal.mysql.com:wl1744 into w2k.:C:/mysql-4.1 2004-11-10 14:02:59 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
083a2f5613 Changed default.c so that it now checks for my.ini and then
my.cnf from the default directories.
2004-11-05 18:59:19 +02:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
lars@mysql.com
485de9cbb7 Fix for bug#5551 (Version 4).
The idea of the fix is that the administrative statements 
OPTIMIZE TABLE, REPAIR TABLE and ANALYZE TABLE should not 
generate binlog errors if there is no errors on the master.
2004-11-03 18:23:58 +01:00
tim@siva.hindu.god
b0510c7fd4 Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
2004-11-02 17:53:25 -07:00
matthias@three.local.lan
afecfd77b5 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
2004-11-01 10:51:43 +01:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
dellis@goetia.(none)
34e5df0d36 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
2004-10-17 18:47:08 -05:00
jani@a193-229-222-105.elisa-laajakaista.fi
4d55c4a321 Improved mysqld_multi documentation, especially the --example
section, which had gotten somewhat out-dated.
2004-10-11 20:54:48 +03:00
jani@a193-229-222-2.elisa-laajakaista.fi
951e54df74 Changed a fatal error to a warning in case the default mysqld
binary for mysqld_multi was not found. This is because it is
possible to define one under each mysqldN group separately.
Bailing out if mysqld binary is not found at all.

Added option --silent to turn off warnings.
2004-10-08 20:18:25 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
724749e9a7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-07 22:09:14 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
a44b6b67a5 Fixed a bug in password handling. All related to Bug#5955. 2004-10-07 22:08:17 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
c73cd9ff8a Fixed Bug#5575, mysqlhotcopy is broken when using --noindices 2004-10-07 20:30:30 +03:00