jimw@mysql.com
ef5ad50ccc
Merge mysql.com:/home/jimw/my/mysql-4.1-9063
...
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-04-26 08:20:51 -07:00
monty@mysql.com
220a01a838
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 16:03:20 +03:00
jimw@mysql.com
93ff028f9d
Fix compile issues in Intel C/C++ compiler (Bug #9063 )
2005-04-25 18:02:03 -07:00
heikki@hundin.mysql.fi
8974ce0836
Many files:
...
Semi-synchronous replication for InnoDB type tables; before telling the client that a commit has been processed, wait that the replication thread has returned from my_net_send() where it sends the binlog to the slave; note that TCP/IP, even with the TCP_NODELAY option does not guarantee that the slave has RECEIVED the data - this is just heuristic at the moment; this is useful in failover: in almost all cases, every transaction that has returned from the commit has been sent and processed in the slave, which makes failover to the slave simpler if the master crashes; the code does not work yet as is, because MySQL should call innobase_report_binlog_offset_and_commit() in a commit; we will most probably return that call to 5.0.x, to make InnoDB Hot Backup and group commit to work again; XA code broke them temporarily in 5.0.3
2005-04-20 19:27:46 +03:00
lars@mysql.com
1bd55e471e
Merging 5.0->5.1
2005-04-19 11:09:54 +02:00
monty@mishka.local
c8170b349f
Merge with 4.1
2005-04-16 04:35:54 +03:00
monty@mishka.local
8d919770c7
Fixed core dump with long timezone names
...
Don't abort on bootstrap if a wrong --default-storage-engine is specified
2005-04-16 03:40:33 +03:00
jimw@mysql.com
ab939dce27
Merge mysql.com:/home/jimw/my/mysql-4.1-9833
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:52:58 -07:00
gbichot@quadita2.mysql.com
bc48cda57d
Adding --innodb_fast_shutdown=2 which shuts down InnoDB faster than the default "1":
...
most InnoDB threads are not terminated properly and the buffer pool is not flushed
to disk. Still no committed transaction is lost as we flush the logs to disk.
InnoDB does crash recovery at startup after this shutdown.
Using this shutdown in testsuite (mysql-test-run --mysqld=--innodb_fast_shutdown=2) saved 3 minutes (13% of total time).
2005-04-15 18:00:38 +02:00
jimw@mysql.com
6632ed5ce7
Check that the default storage engine is really available, and
...
refuse to start up if it is not. (Bug #9815 )
2005-04-13 18:25:31 -07:00
jimw@mysql.com
47ab7c8785
Don't allow the server to start up when an invalid user is
...
specified via --user or in configuration. (Bug #9833 )
2005-04-13 15:43:29 -07:00
mskold@mysql.com
add3fd3cca
Merge
2005-04-13 16:24:17 +02:00
mskold@mysql.com
e39ba63934
Merge
2005-04-13 14:08:54 +02:00
mskold@mysql.com
f5855f2d57
Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit
2005-04-13 12:42:23 +02:00
reggie@mdk10.(none)
4bb4a285ab
Merge mdk10.(none):/home/reggie/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-04-11 09:29:49 -05:00
reggie@mdk10.(none)
3f5b8b976c
Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
...
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
2005-04-08 09:17:19 -05:00
reggie@mdk10.(none)
c55a7b651f
Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
...
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.
2005-04-08 00:16:02 -05:00
monty@mysql.com
beb28b27e0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-06 17:23:34 +03:00
monty@mysql.com
49e721677f
Fixed errors descovered by valgrind 2.4
...
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03:00
monty@mysql.com
b9fdb65b18
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-06 15:53:32 +03:00
monty@mysql.com
6483a71e82
Fixed that create_time is set properly for cached threads
2005-04-06 15:52:32 +03:00
jimw@mysql.com
9ff854dd12
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-05 07:59:11 -07:00
serg@serg.mylan
71811298b9
sql/item.cc
...
after merge fix
sql/mysqld.cc
too early for sync-binlog=1 by default :)
2005-04-05 14:46:18 +02:00
serg@serg.mylan
c796ea598c
Merge
2005-04-05 13:23:11 +02:00
serg@serg.mylan
810b2c3d40
remove the rest of isam/merge references
...
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
jimw@mysql.com
bb215f648b
Merge
2005-04-04 23:03:56 -07:00
jimw@mysql.com
9e16f12145
Fix handling of max_allowed_packet and net_buffer_length in
...
embedded server when a size suffix (K, M, G) is added. (Bug #9472 )
2005-04-01 16:09:20 -08:00
patg@patrick.local
8e0eb65f9a
5.0 to 5.1 merge
2005-04-01 12:32:17 -08:00
monty@mysql.com
201ee3eb78
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902 )
...
CAST() now produces warnings when casting a wrong INTEGER or CHAR values. This also applies to implicite string to number casts. (Bug #5912 )
ALTER TABLE now fails in STRICT mode if it generates warnings.
Inserting a zero date in a DATE, DATETIME or TIMESTAMP column during TRADITIONAL mode now produces an error. (Bug #5933 )
2005-04-01 15:04:50 +03:00
bar@mysql.com
6d3f944d80
merge
2005-03-29 17:24:26 +05:00
konstantin@mysql.com
2115900460
Remove redundant my_security_attr_free() from
...
handle_connections_shared_memory (double free spotted by Monty).
2005-03-29 14:30:34 +04:00
konstantin@mysql.com
eeeedd31b9
Manual merge
2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3
A fix for Bug#8226 "Cannot connect via shared memory":
...
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
2005-03-26 01:21:52 +03:00
brian@zim.(none)
7b81a9fd4c
Merging support for blackhole up to 5.0.
2005-03-25 10:36:58 -08:00
brian@zim.(none)
6e2caeb0ce
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-03-24 16:08:48 -08:00
gbichot@quadita2.mysql.com
32f1e3b029
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-03-24 15:44:50 +01:00
gbichot@quadita2.mysql.com
5acca04c7c
merge from 4.1
2005-03-24 14:32:40 +01:00
msvensson@neptunus.(none)
c4a698ea3e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 12:21:55 +01:00
gbichot@quadita2.mysql.com
19499229ed
"After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
...
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
2005-03-23 19:19:36 +01:00
msvensson@neptunus.(none)
9f05cbfbd7
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-03-23 13:25:31 +01:00
brian@zim.(none)
cfcedd85cd
Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.
2005-03-22 16:10:39 -08:00
lars@mysql.com
efb077502d
Merge
2005-03-21 23:05:55 +01:00
monty@mysql.com
a1ab786091
Cleanups during review of code
...
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02:00
lars@mysql.com
c6d85289ab
WL#2472:
...
Renamed Table_filter to Rpl_filter
Eliminated very annoying memory leak
2005-03-21 22:09:42 +01:00
msvensson@neptunus.(none)
a5bb4810ff
BUG#9072 'Max_error_count' system variable cannot be set to zero
...
- Chaned min value in mysqld.cc
- Added testcase to warnings.test
2005-03-21 11:07:31 +01:00
tomas@poseidon.ndb.mysql.com
39eceb9a1b
mysqld.cc:
...
changed mysqld.cc to the same as in 5.0
2005-03-17 16:52:53 +01:00
tomas@poseidon.ndb.mysql.com
7cc49e6b95
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-03-17 15:29:25 +01:00
serg@serg.mylan
d7b2d4c541
global read lock code now uses a dedicated mutex
...
(otherwise a deadlock when ALTER writes to
binlog holding LOCK_open, it causes binlog rotation,
binlog waits for prepared transactions to commit, and commit
needs LOCK_open to check for global read lock)
2005-03-16 08:40:19 +01:00
tomas@poseidon.ndb.mysql.com
1d1be36d87
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-03-16 02:50:02 +01:00
serg@serg.mylan
dba1e0889a
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 14:47:51 +01:00