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
33437 commits 2793 branches 343 tags 1.7 GiB
Commit graph

33437 commits

This branch
This branch
All branches
Author SHA1 Message Date
mleich@mysql.com
578406665a Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-26 17:00:58 +02:00
aivanov@mysql.com
28e20421b5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 19:00:57 +04:00
aivanov@mysql.com
1c98f3e262 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 12:48:12 +04:00
aivanov@mysql.com
88e7e55bb5 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 11:27:15 +04:00
aivanov@mysql.com
b34ec32b5b Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 11:23:43 +04:00
aivanov@mysql.com
11687d2f84 Make innodb_mysql produce a non-empty output. 2006-04-26 11:15:09 +04:00
tomas@poseidon.ndb.mysql.com
c1d0294983 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 08:38:50 +02:00
aivanov@mysql.com
c66893cd54 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
 2006-04-26 09:59:05 +04:00
aivanov@mysql.com
b748835897 Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
 2006-04-26 09:56:06 +04:00
aivanov@mysql.com
7b8c526078 Files innodb.[test|result] are to be used by Innobase only. 
Use files innodb_mysql.[test|result] instead.
 2006-04-26 09:51:57 +04:00
aivanov@mysql.com
0eb36757a8 Applied innodb-5.1-ss492 snapshot. 
* Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 * Remove obsolete and unused variables from srv0srv.c.
 * Remove srv_sys->operational since it is unused.
 * Make thread_id parameter in os_thread_create() optional.
 * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
   and convert thread start functions to use them.
 2006-04-26 08:30:37 +04:00
andrey@lmy004.
679f609793 disable before investigation why test case for 19170 is failing on 
some platforms.
 2006-04-26 07:29:26 +03:00
aivanov@mysql.com
be7adcccbf Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
 Null-merge.
 2006-04-26 07:53:49 +04:00
aivanov@mysql.com
422071a83e Applied innodb-5.0-ss492 snapshot. 
Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 2006-04-26 07:50:29 +04:00
tomas@poseidon.ndb.mysql.com
0e8ccc1bee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 01:13:16 +02:00
tomas@poseidon.ndb.mysql.com
fc387e73c0 ndb: break out ndb backup compatability test, so that it can be disabled on mac 2006-04-26 01:11:40 +02:00
kent@mysql.com
e6b3de1260 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-26 00:28:54 +02:00
kent@mysql.com
3e2cc998a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-04-25 22:40:04 +02:00
tomas@poseidon.ndb.mysql.com
f2d4d4cfaf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-25 22:21:47 +02:00
andrey@lmy004.
e0c68bffb4 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-new-clean
 2006-04-25 23:14:49 +03:00
aelkin@mysql.com
61e41ac212 BUG#17263: incorrect DROP query in temporary tables replication 
the fix from 5.0 with necessary modifications applied.
 2006-04-25 22:53:50 +03:00
aelkin@mysql.com
3363effa52 Merge mysql.com:/home/elkin/MySQL/BARE/5.0 
into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new
 2006-04-25 20:05:15 +03:00
mleich@mysql.com
ec163e9d1e Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-25 19:05:07 +02:00
stewart@mysql.com
ebbff7ee3f BUG#19340 small leak in ndbd 
small cleanup fixes in kernel/vm/Configuration
 2006-04-25 10:04:46 -07:00
mleich@mysql.com
3bddd31b92 Post merge correction for the Changeset 
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
  and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
- Reactivation of testcase rpl_deadlock_innodb + updated file with expected results
- Removal of wrong entry within disabled.def
 2006-04-25 18:28:29 +02:00
pem@mysql.com
f1374951c9 Post-merge fixes from 5.0. 2006-04-25 17:44:35 +02:00
jonas@perch.ndb.mysql.com
49d0bd9beb reenable ndb_cache2 & ndb_cach_multi2 as I've fixed bug-18597 2006-04-25 17:02:50 +02:00
jonas@perch.ndb.mysql.com
e8797b49d2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-25 17:02:49 +02:00
jonas@perch.ndb.mysql.com
c19ab931c6 ndb - 
Fix bootstrap/compile error
 2006-04-25 17:02:48 +02:00
jonas@perch.ndb.mysql.com
4e9c9e2f14 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-25 17:02:47 +02:00
tomas@poseidon.ndb.mysql.com
fde6059554 ndb_restore: more compatablitity checks 2006-04-25 17:02:46 +02:00
pem@mysql.com
0e2d20b1cb Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-merge 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-04-25 16:20:49 +02:00
tomas@poseidon.ndb.mysql.com
e005a6900b Merge jonas@perch:src/51-work/ 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-25 16:19:57 +02:00
jonas@perch.ndb.mysql.com
f4e3c711fd Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-25 16:03:21 +02:00
jonas@perch.ndb.mysql.com
ef29fc68b3 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work
 2006-04-25 16:01:54 +02:00
jonas@perch.ndb.mysql.com
a23944b988 ndb - bug#18597 
Handle early abort of scan, so that resources are correctly freed
 2006-04-25 16:01:08 +02:00
mskold@mysql.com
8d04fd256d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 14:07:41 +02:00
tomas@poseidon.ndb.mysql.com
3d8c52615f modified ndb backup/restore to be byte order independant 
- the replica info was not stored in byte order indepentent format
- backup/restore still compatible 5.0->5.1
- but patch makes previous 5.1 versions completely incompatible
 2006-04-25 14:02:15 +02:00
jonas@perch.ndb.mysql.com
834d349f19 ndb - 
1) relax version check for restore block since no changes has happend since 5.1.6
   and improve error message on check failure
   
2) improve lcp/backup max write size...
 2006-04-25 13:32:10 +02:00
tomas@poseidon.ndb.mysql.com
b51074f281 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-25 13:09:06 +02:00
mskold@mysql.com
051e6ac994 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-25 12:46:40 +02:00
mskold@mysql.com
b7ce4c94b4 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 12:42:22 +02:00
mskold@mysql.com
435c1028fc Fixed memleak detected by valgrind 2006-04-25 12:40:31 +02:00
tomas@poseidon.ndb.mysql.com
03af14c9b9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-25 12:22:54 +02:00
evgen@moonbone.local
6ea27b1013 Manually merged 2006-04-25 13:04:39 +04:00
mskold@mysql.com
4d771e4fca Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
 2006-04-25 10:36:39 +02:00
mskold@mysql.com
b36469ba82 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
 2006-04-25 10:23:16 +02:00
mskold@mysql.com
5eb07ec747 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 08:48:10 +02:00
tomas@poseidon.ndb.mysql.com
f21fd09403 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-25 08:01:47 +02:00
knielsen@mysql.com
eb53a5b02c Merge knielsen@10.100.52.19:/usr/local/mysql/mysql-5.0-mtr-fix 
into  mysql.com:/data0/knielsen/mysql-5.0-mtr-fix
 2006-04-24 23:56:36 +02:00