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
monty@mysql.com
a1ab786091
Cleanups during review of code
...
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02: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
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
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
heikki@hundin.mysql.fi
a95f09e228
set_var.cc, mysqld.cc, ha_innodb.cc, sql_class.h:
...
Add a settable session variable innodb_support_xa; setting it to 0 can save up to 10 % of CPU time and 150 bytes of space in each undo log
trx0trx.h, trx0undo.c, trx0trx.c, trx0roll.c:
Enable XA if innodb_support_xa is not set to 0; make prepare to do log fsync's according to innodb_flush_log_at_trx_commit
2005-03-13 12:49:39 +02:00
serg@serg.mylan
32700d1430
if no xa recovery (or after it):
...
warning on startup if prepared foreign xids
error on startup if prepared our xids
temporarily: always rollback prepared our xids instead of an error
2005-03-12 20:09:54 +01:00
jimw@mysql.com
71fd853121
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-09 10:40:27 -08:00
serg@serg.mylan
79573a5ee8
after merge fixes
2005-03-09 19:22:30 +01:00
jimw@mysql.com
635ba88a4c
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-09 09:39:05 -08:00
jimw@mysql.com
3c7c548b9a
Fix change made to ER_READY by creating a new message, instead.
2005-03-09 08:56:50 -08:00
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
serg@serg.mylan
6121422820
sql/mysqld.cc
...
preserve backward compatibility
2005-03-09 13:41:57 +01:00
marko@hundin.mysql.fi
fa001505e3
mysqld.cc:
...
main(): add missing parameter to printf(ER(ER_READY),...) call
2005-03-08 22:33:11 +02:00
serg@serg.mylan
2472810489
Fixed crash if max_connections is exceeded. BUG#8996
2005-03-07 13:59:28 +01:00
gbichot@quadita2.mysql.com
fa27e11923
Default value of slave_transaction_retries is now 10
...
(whereas it's 0 in 4.1, for safety as this is new code).
2005-03-07 12:49:38 +01:00
konstantin@mysql.com
0f1d024461
Porting of "buffered read" patch to 5.0 and post-review fixes.
...
The patch implements the idea suggested by Olaf van der Spek in
thread "Client: many small reads?" (internals@lists.mysql.com ).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving
one-column tables.
2005-03-06 00:10:08 +03:00
ingo@mysql.com
9e02be68c8
Merge
2005-03-04 11:38:14 +01:00
ingo@mysql.com
b5775ee16c
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-03-04 09:35:21 +01:00
serg@serg.mylan
08d5ef6507
typos fixed
2005-03-03 23:10:23 +01:00
serg@serg.mylan
e47d0a0e2d
merge
2005-03-03 23:07:20 +01:00
serg@serg.mylan
8d9a53a78c
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
2005-03-03 19:51:29 +01:00
guilhem@mysql.com
c6f1a2e453
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-03-02 11:38:38 +01:00
guilhem@mysql.com
11a1c83c03
Fix for BUG#8325 "Deadlock in replication thread stops replication":
...
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
2005-03-02 11:29:48 +01:00
jani@ua141d10.elisa.omakaista.fi
530b12166e
Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info".
2005-03-01 14:13:25 +02:00
monty@mysql.com
253bfcf783
Fixed wrong memory references found by purify
...
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +02:00
jimw@mysql.com
df3c8db4f3
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-22 13:14:49 -08:00
lars@mysql.com
2d1089e8c1
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
2005-02-22 13:22:34 +01:00
lars@mysql.com
1d3c67000b
BUG#6662: Changes after Guilhems and Sergs review
2005-02-22 12:40:31 +01:00
lars@mysql.com
be28ef0a20
BUG#6662: Importing mysqldumps should not show any warnings of level "notes".
2005-02-21 18:40:28 +01:00
jimw@mysql.com
793a505c26
Fix merge of fix for Bug #4872 .
2005-02-18 15:02:54 -08:00
hf@deer.(none)
93e0107050
Fix for the bug #7344 (multiple server_init/server_end lead to crash)
...
Some variable wasn't moved to the initial state during mysql_server_end
2005-02-18 15:51:55 +04:00
jimw@mysql.com
9df24e5ebd
When calling initgroups(), set a flag that the segfault handler checks
...
in order to output a special warning about a particular case of segfaults
due to a mix of static binaries, NSS, and LDAP. (Bug #4872 )
2005-02-16 11:58:35 -08:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb
Applied a patch for Netware.
2005-02-08 19:49:40 +02:00
serg@serg.mylan
33fc4b10b6
configure.in
...
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
hide from the user options that do nothing
sql/sql_update.cc
better fix for uninitialized used_index
2005-02-02 12:08:20 +01:00
heikki@hundin.mysql.fi
61a0e57cd0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-27 21:33:15 +02:00
ram@gw.mysql.r18.ru
7f6fca4cf0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-26 17:09:38 +04:00
heikki@hundin.mysql.fi
9a6e0d06e0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-25 22:12:22 +02:00
heikki@hundin.mysql.fi
d7e5c4d617
sql_class.h, set_var.cc, mysqld.cc:
...
Add settable variables for semi-sync replication
2005-01-25 22:11:21 +02:00