Commit graph

6129 commits

Author SHA1 Message Date
walrus@mysql.com
288ca7e64b Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2003-04-04 00:19:17 +06:00
guilhem@mysql.com
e2151132a0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-04-03 20:19:15 +02:00
guilhem@mysql.com
f33c6e7c83 More honest --master-ssl* options description. As these do nothing
yet, better say it and see no traffic on bugs@ and support@.
2003-04-03 20:19:14 +02:00
heikki@hundin.mysql.fi
9a5578af57 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2003-04-03 21:19:14 +03:00
guilhem@mysql.com
8611c34e5e Explicit message to warn that logging (e.g. binary) is permanently turned off
because of writing problems (such message would have been useful during a recent
support task).
2003-04-03 20:19:13 +02:00
heikki@hundin.mysql.fi
8aa7532990 log.cc:
Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled
2003-04-03 21:19:13 +03:00
jani@hynda.(none)
cbd11df297 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into hynda.(none):/home/my/bk/mysql-4.0
2003-04-03 21:19:12 +03:00
monty@narttu.mysql.fi
aa4bf1cd8d After merge fix 2003-04-03 21:19:11 +03:00
monty@narttu.mysql.fi
e5cbaeb2ab Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 21:19:10 +03:00
vva@eagle.mysql.r18.ru
46af747b09 add test file for rpl_loaddata.test 2003-04-03 14:19:09 -04:00
Sinisa@sinisa.nasamreza.org
19ef95be2a test case for displaying and correct functioning of ALTER TABLE
ENABLE / DISABLE KEYS
2003-04-03 21:17:53 +03:00
Sinisa@sinisa.nasamreza.org
10957fb0f3 One test case, one bug fix and one new feature 2003-04-03 20:24:15 +03:00
jani@hynda.(none)
75015595b1 Fixed a bug when printing error messages. stdout and stderr were
mixed wrongly sometimes.
2003-04-03 19:55:37 +03:00
monty@narttu.mysql.fi
d56dc85205 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 19:55:37 +03:00
vva@eagle.mysql.r18.ru
04b81ac9ac Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 12:55:36 -04:00
vva@eagle.mysql.r18.ru
f45be5e6cd added test for replication load data into temporary table with additional options 2003-04-03 12:54:08 -04:00
walrus@mysql.com
14d961a033 test-transactions.sh:
correct misprint in the test_update
2003-04-03 21:51:14 +06:00
vva@eagle.mysql.r18.ru
4fb9cb0097 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 10:30:41 -04:00
monty@narttu.mysql.fi
957834795e Updated results after merge 2003-04-03 13:21:39 +03:00
monty@narttu.mysql.fi
8f957e6ab5 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0 2003-04-03 13:08:28 +03:00
monty@narttu.mysql.fi
e96c75fec0 Fixed bug in memory allocation that could affect 64 bit systems (affected hammer) 2003-04-03 13:07:42 +03:00
monty@narttu.mysql.fi
618857b6eb Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.
2003-04-03 12:33:13 +03:00
monty@narttu.mysql.fi
3cdc8ae55b Portability fix (for AMD hammer) 2003-04-03 12:10:38 +03:00
monty@narttu.mysql.fi
bf315f30d5 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 11:29:38 +03:00
monty@narttu.mysql.fi
c1ff07cbb9 Safer stack checking 2003-04-03 11:29:10 +03:00
Sinisa@sinisa.nasamreza.org
c588cf6889 A fix for a bug in multi-table updates which was always caused
whenever a temporary MyISAM table had to be created from HEAP table.
2003-04-02 17:05:34 +03:00
guilhem@mysql.com
4824d6c66c Sprint task : make table exclusion rules (in replication)
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
Sinisa@sinisa.nasamreza.org
7b29e8fcc4 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-04-01 20:01:15 +03:00
guilhem@mysql.com
1211b9a513 Small-and-safe fix for bug : "LOAD DATA INFILE IGNORE is well
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.
2003-04-01 18:19:15 +02:00
greg@mysql.com
6441347435 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-31 11:28:41 -05:00
greg@mysql.com
fbe8359e4f Add new XDC file for NetWare pre-emption, drop old build scripts, libmysqld.def 2003-03-31 11:28:20 -05:00
lenz@mysql.com
09c175a07a - Fix for bug (added missing @WRAPLIBS@ to LIBS in
libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian
   for pointing this out)
2003-03-31 14:50:29 +02:00
Sinisa@sinisa.nasamreza.org
6e49edda92 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-31 15:23:27 +03:00
bell@sanja.is.com.ua
4d87fd0346 fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility) 2003-03-31 09:49:09 +03:00
bell@sanja.is.com.ua
63cb565895 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-03-30 17:16:39 +03:00
hf@deer.mysql.r18.ru
deca14ebde truncating REPLACE result bug fix 2003-03-30 18:36:01 +05:00
Sinisa@sinisa.nasamreza.org
f5c9611a66 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-28 17:58:30 +02:00
bell@sanja.is.com.ua
439ac36d52 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0
2003-03-28 15:36:42 +02:00
greg@mysql.com
9aeb60210f Improve make_binary_distribution from Novell code at Monty's request 2003-03-27 18:13:37 -05:00
greg@mysql.com
f885807e4f Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-27 16:36:07 -05:00
monty@mashka.mysql.fi
7f2fb977a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-03-27 13:54:22 +02:00
heikki@hundin.mysql.fi
034d02f55b mysqld.cc:
Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction
2003-03-27 12:17:27 +02:00
greg@mysql.com
8691b0a67e Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-26 16:23:28 -05:00
bell@sanja.is.com.ua
a5222e1c69 fixed problem of port without host in SHOW PROCESSLIST (bug 189) 2003-03-26 22:04:20 +02:00
Sinisa@sinisa.nasamreza.org
453299b185 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-03-26 16:28:59 +02:00
monty@mashka.mysql.fi
ff12a11829 Fix for stack size checking on Solaris. 2003-03-26 14:51:22 +02:00
monty@mashka.mysql.fi
a34bc8eef7 Fix for glibc with small stack size (fixes bug when running crash-me) 2003-03-26 14:11:17 +02:00
vva@eagle.mysql.r18.ru
af61a4c7fa Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-03-25 19:58:40 -04:00
vva@eagle.mysql.r18.ru
e1173e70a5 fix bug with parameters of LOAD DATA INFILE in exec_event 2003-03-25 19:57:38 -04:00
lenz@mysql.com
26f46fd345 - fixed typo (build_command -> build-command) 2003-03-25 22:38:12 +01:00