mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33474 commits 2790 branches 343 tags 1.7 GiB
Commit graph

33474 commits

This branch
This branch
All branches
Author SHA1 Message Date
elliot@mysql.com
5617f3387a Fix merge 2006-04-27 17:42:55 -04:00
elliot@mysql.com
bd01c06791 Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge-tiny
 2006-04-27 17:16:27 -04:00
tomas@poseidon.ndb.mysql.com
27739485a9 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-27 08:25:55 +02:00
sergefp@mysql.com
b364d2d388 Merge mysql.com:/home/psergey/bk-trees/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.1-merge
 2006-04-27 01:41:27 +04:00
tomas@poseidon.ndb.mysql.com
33d169f89b 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 23:10:32 +02:00
elliot@mysql.com
d96fbd738d The fix for bug#17248 accidentally removed the sync_binlog variable. 
This patch restores sync_binlog.
 2006-04-26 11:55:26 -04:00
mskold@mysql.com
6d01bcdf45 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-26 17:01:01 +02:00
tomas@poseidon.ndb.mysql.com
f12c6e9940 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 17:01:00 +02:00
mleich@mysql.com
be4faa067b Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-26 17:01:00 +02:00
mskold@mysql.com
4911a82c0e 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-26 17:01:00 +02:00
ingo@mysql.com
7b78dca873 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-26 17:00:59 +02:00
mleich@mysql.com
388d91f2e1 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:59 +02:00
mskold@mysql.com
63106c0634 Added test for violation of uniqueness constraint at create index 2006-04-26 17:00:59 +02:00
mskold@mysql.com
cb696feb0e Corrected include path to work under Windows 2006-04-26 17:00:58 +02:00
ingo@mysql.com
af385df39a Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-26 17:00:58 +02:00
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
tomas@poseidon.ndb.mysql.com
ee3bdf586b Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart 
- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error
 2006-04-26 16:57:45 +02:00
tomas@poseidon.ndb.mysql.com
edba345e56 Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error 
- added retry handling of temporary transaction errors
 2006-04-26 16:57:44 +02:00
tomas@poseidon.ndb.mysql.com
103df5b273 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-26 16:57:43 +02:00
jonas@perch.ndb.mysql.com
63a6989a0b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-26 16:57:42 +02:00
tomas@poseidon.ndb.mysql.com
2c9d6095ea ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions 2006-04-26 16:57:41 +02:00
bell@sanja.is.com.ua
0e331dfb92 fixed error message text 2006-04-26 17:57:41 +03:00
jonas@perch.ndb.mysql.com
ca04daab27 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-26 16:57:41 +02:00
aivanov@mysql.com
4afe473ed5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 18:57:40 +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
419d4980e0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 12:45:29 +04:00
aivanov@mysql.com
6f8c03ee69 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
 2006-04-26 12:43:38 +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
bpontz@mysql.com
92825f3ada configure.in: 
clone-off for 5.0.21
 2006-04-26 08:26:33 +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
serg@sergbook.mysql.com
ed3f3fa0c7 after merge 2006-04-25 22:39:59 -07:00
serg@sergbook.mysql.com
ab2820e80f Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2006-04-25 21:32:30 -07: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
serg@sergbook.mysql.com
54c97e6150 after merge fix 2006-04-25 17:12:06 -07: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
sergefp@mysql.com
078ec307ae Fix compile failure on Win32 2006-04-26 01:21:33 +04:00
serg@sergbook.mysql.com
c97d923cfd merged 2006-04-25 14:06:04 -07: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
serg@sergbook.mysql.com
3144d5eb48 buffer overflow and information exposure bugs fixed 
(reported by Stefano Di Paola)
 2006-04-25 13:37:33 -07:00