mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20797 commits 2793 branches 343 tags 1.7 GiB
Commit graph

20797 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
34c5892c44 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-03-03 18:36:31 +01:00
tomas@poseidon.ndb.mysql.com
04cd65b91a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-03-03 17:29:22 +01:00
stewart@mysql.com
59f32b3da7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb 
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
 2005-03-04 03:11:44 +11:00
tomas@poseidon.ndb.mysql.com
7d433d03ce Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-03-03 16:52:03 +01:00
konstantin@mysql.com
fe2d63a060 Fixes for bug#8115 "Server Crash with prepared statement" 
and bug#8849 "problem with insert statement with table alias's": 
make equality propagation work in stored procedures and prepared 
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.
 2005-03-03 17:38:59 +03:00
gluh@gluh.mysql.r18.ru
66bd0447e4 Fix for bug#8740: Server crash at start on Solaris 9 (64 bit) 2005-03-03 17:38:58 +03:00
joerg@mysql.com
613e6adc44 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-03-03 12:45:05 +01:00
ramil@mysql.com
710a32621c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0
 2005-03-03 15:38:00 +04:00
ramil@mysql.com
e9a20acbb6 After merge fix. 2005-03-03 15:37:14 +04:00
joerg@mysql.com
809b18e298 Prevent a collision with the system's '#define errno ...' by guarding the variable declaration. 2005-03-03 12:35:39 +01:00
ramil@mysql.com
de1153b5e6 manual merge 2005-03-03 14:29:37 +04:00
pem@mysql.com
f170e8e03e Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-03 10:51:20 +01:00
guilhem@mysql.com
cde5a9d4bb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-xa
 2005-03-03 10:51:19 +01:00
tomas@poseidon.ndb.mysql.com
0169c29425 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-03-03 09:55:04 +01:00
tomas@poseidon.ndb.mysql.com
3d4ac142fc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-03-03 09:52:25 +01:00
mysqldev@mysql.com
29ea973a57 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/data0/mysqldev/my/mysql-5.0-merge
 2005-03-03 09:50:06 +01:00
stewart@mysql.com
f2856134bf Add ndb/src/mgmapi/mgmapi_internal.h 
move internal mgmapi functions into it.

should also fix AIX build problem.
 2005-03-03 19:49:58 +11:00
mysqldev@mysql.com
2d70229ffc committing this deletion of federated.disabled, which was already committed in another tree apparently; just to make bk happy. 2005-03-03 09:49:34 +01:00
pem@mysql.com
5021eebe1d Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-03 09:46:13 +01:00
guilhem@mysql.com
9df7bb253d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-xa
 2005-03-03 09:37:07 +01:00
joreland@mysql.com
50a69b1b5c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-03-03 08:52:44 +01:00
joreland@mysql.com
d0c4159fde Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-03-03 08:50:37 +01:00
joreland@mysql.com
744509d6c0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-03-03 08:35:55 +01:00
patg@krsna.patg.net
7038981d0b WL# 2094, removed federated 'disable' file. 2005-03-02 16:14:46 -08:00
petr@mysql.com
1ed5aa2328 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/cps/mysql/devel/im-fix-review
 2005-03-02 23:18:53 +03:00
petr@mysql.com
f2791b9e96 fix to avoid relinking on each "make" 2005-03-02 23:16:32 +03:00
pem@mysql.com
e4908b4020 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-03-02 18:05:57 +01:00
patg@krsna.patg.net
e3f8c2f51e Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-merge 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-03-02 09:01:07 -08:00
guilhem@mysql.com
7110f21c39 Last part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" + fixes after merge 2005-03-02 17:52:38 +01:00
pem@mysql.comhem.se
027c5a6dac Fixed BUG#8762: Stored Procedures: Inconsistent behavior 
of DROP PROCEDURE IF EXISTS statement.
 2005-03-02 17:25:58 +01:00
ramil@mysql.com
89d44e039e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1
 2005-03-02 20:04:38 +04:00
patg@krsna.patg.net
0aec332ba3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-03-02 08:04:26 -08:00
ramil@mysql.com
89a105abc5 a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used) 2005-03-02 20:00:48 +04:00
guilhem@mysql.com
d1f089b3d7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-xa
 2005-03-02 16:40:04 +01:00
guilhem@mysql.com
c4ac232d17 First part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" 
(next part is updating test results)
 2005-03-02 16:37:54 +01:00
joerg@mysql.com
23935cf870 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-03-02 16:21:10 +01:00
serg@serg.mylan
998c540fa9 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-02 15:31:03 +01:00
serg@serg.mylan
60e1c869f5 workaround for a bug removed 2005-03-02 15:29:46 +01:00
guilhem@mysql.com
c6cedf52e3 Merge 2005-03-02 14:46:19 +01:00
marko@hundin.mysql.fi
74194d23de InnoDB: Merge fix of Bug #8771 from the 4.1 tree 2005-03-02 12:49:51 +02:00
ingo@mysql.com
2d9909aef9 Bug#8306 - TRUNCATE leads to index corruption 
After merge fix.
The bugfix results in a different error message in this situation.
 2005-03-02 11:49:50 +01:00
joerg@mysql.com
39ac2c0108 Variable 'k' declared at both loop and function level caused compiler failures - 
use function-wide declaration also for loop body.
 2005-03-02 11:47:09 +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
ingo@mysql.com
306bd2fc69 Merge 2005-03-02 10:56:13 +01:00
serg@serg.mylan
7535886f1c Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-03-02 10:41:23 +01:00
serg@serg.mylan
02d88c398f bug#8151 - truncate leaves a transaction open 
deadlock in MYSQL_LOG::new_file()
style fixes
 2005-03-02 10:38:25 +01:00
ingo@mysql.com
d3d7c46b1c Bug#8306 - TRUNCATE leads to index corruption 
Added a check, if the table, which we are going to create, is open.
This can happen if a MERGE mapped table is TRUNCATEd.
 2005-03-02 10:35:00 +01:00
patg@krsna.patg.net
9e3c670b02 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into krsna.patg.net:/home/patg/mysql-5.0
 2005-03-01 23:23:11 -08:00
jan@hundin.mysql.fi
b9ae89a1e6 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/jan/mysql-5.0
 2005-03-02 07:48:00 +02:00