Commits · 7c4ddc8bd42d9179a1f4462dd26560dcf3698fdc · Kirill Smelkov / mariadb

28 Apr, 2006 2 commits
- mysqlslap.c: · 7c4ddc8b
  paul@polar.kitebird.com authored Apr 28, 2006
```
  Avoid embedding a bunch of whitespace in --help message.
```
  7c4ddc8b
- Disable unstable test case. · 6c2f4772
  knielsen@mysql.com authored Apr 28, 2006
  
  6c2f4772
27 Apr, 2006 3 commits
- Fix merge · 5617f338
  elliot@mysql.com authored Apr 27, 2006
  
  5617f338
- Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2 · bd01c067
  elliot@mysql.com authored Apr 27, 2006
```
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge-tiny
```
  bd01c067
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 27739485
  tomas@poseidon.ndb.mysql.com authored Apr 27, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  27739485
26 Apr, 2006 35 commits
- Merge mysql.com:/home/psergey/bk-trees/mysql-5.0 · b364d2d3
  sergefp@mysql.com authored Apr 27, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge
```
  b364d2d3
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 33d169f8
  tomas@poseidon.ndb.mysql.com authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  33d169f8
- The fix for bug#17248 accidentally removed the sync_binlog variable. · d96fbd73
  elliot@mysql.com authored Apr 26, 2006
```
This patch restores sync_binlog.
```
  d96fbd73
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6d01bcdf
  mskold@mysql.com authored Apr 26, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
  6d01bcdf
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · f12c6e99
  tomas@poseidon.ndb.mysql.com authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  f12c6e99
- Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · be4faa06
  mleich@mysql.com authored Apr 26, 2006
```
into  three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-Bug
```
  be4faa06
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4911a82c
  mskold@mysql.com authored Apr 26, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
  4911a82c
- Merge mysql.com:/home/mydev/mysql-5.1 · 7b78dca8
  ingo@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129
```
  7b78dca8
- Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 388d91f2
  mleich@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
```
  388d91f2
- Added test for violation of uniqueness constraint at create index · 63106c06
  mskold@mysql.com authored Apr 26, 2006
  
  63106c06
- Corrected include path to work under Windows · cb696feb
  mskold@mysql.com authored Apr 26, 2006
  
  cb696feb
- Merge mysql.com:/home/mydev/mysql-5.1 · af385df3
  ingo@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129
```
  af385df3
- Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 57840666
  mleich@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
```
  57840666
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 28e20421
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
  28e20421
- Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart · ee3bdf58
  tomas@poseidon.ndb.mysql.com authored Apr 26, 2006
```
- 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
```
  ee3bdf58
- Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error · edba345e
  tomas@poseidon.ndb.mysql.com authored Apr 26, 2006
```
- added retry handling of temporary transaction errors
```
  edba345e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 103df5b2
  tomas@poseidon.ndb.mysql.com authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  103df5b2
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 63a6989a
  jonas@perch.ndb.mysql.com authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  63a6989a
- ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions · 2c9d6095
  tomas@poseidon.ndb.mysql.com authored Apr 26, 2006
  
  2c9d6095
- fixed error message text · 0e331dfb
  bell@sanja.is.com.ua authored Apr 26, 2006
  
  0e331dfb
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · ca04daab
  jonas@perch.ndb.mysql.com authored Apr 26, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  ca04daab
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4afe473e
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
```
  4afe473e
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1c98f3e2
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
  1c98f3e2
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 419d4980
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
```
  419d4980
- Merge mysql.com:/home/alexi/mysql-5.0 · 6f8c03ee
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492
```
  6f8c03ee
- Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492 · 88e7e55b
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
  88e7e55b
- Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work · b34ec32b
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
```
  b34ec32b
- Make innodb_mysql produce a non-empty output. · 11687d2f
  aivanov@mysql.com authored Apr 26, 2006
  
  11687d2f
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c1d02949
  tomas@poseidon.ndb.mysql.com authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  c1d02949
- configure.in: · 92825f3a
  bpontz@mysql.com authored Apr 26, 2006
```
  clone-off for 5.0.21
```
  92825f3a
- Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work · c66893cd
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
```
  c66893cd
- Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work · b7488358
  aivanov@mysql.com authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
```
  b7488358
- Files innodb.[test|result] are to be used by Innobase only. · 7b8c5260
  aivanov@mysql.com authored Apr 26, 2006
```
 Use files innodb_mysql.[test|result] instead.
```
  7b8c5260
- after merge · ed3f3fa0
  serg@sergbook.mysql.com authored Apr 25, 2006
  
  ed3f3fa0
- Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1 · ab2820e8
  serg@sergbook.mysql.com authored Apr 25, 2006
```
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
```
  ab2820e8