Commits · ad88a849c8659b6e024af7691fed55c6d67a38ed · Kirill Smelkov / mariadb

14 Jun, 2007 2 commits
- Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · ad88a849
  Justin.He/justin.he@dev3-240.dev.cn.tlan authored Jun 14, 2007
```
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
```
  ad88a849
- Bug#27640, backup id not displayed in the output of "ndb_mgm start backup wait completed" · 51fe11b4
  Justin.He/justin.he@dev3-240.dev.cn.tlan authored Jun 14, 2007
  
  51fe11b4
30 May, 2007 5 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 52269dc2
  tomas@whalegate.ndb.mysql.com authored May 30, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  52269dc2
- Bug #28443 · 0d4bf93e
  tomas@whalegate.ndb.mysql.com authored May 30, 2007
```
- correction of merge error
```
  0d4bf93e
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · a325e1db
  tomas@whalegate.ndb.mysql.com authored May 30, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  a325e1db
- Bug #28770 file already opened error when corrupt schema file · 720f56fb
  tomas@whalegate.ndb.mysql.com authored May 30, 2007
```
- make sure we close the first file, before opening the next
```
  720f56fb
- Bug #28749 MaxNoOfOpenFiles offset by 1 · 5783f5ab
  tomas@whalegate.ndb.mysql.com authored May 30, 2007
  
  5783f5ab
28 May, 2007 9 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 05985b89
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  05985b89
- print user and system time at watchdog check · 643cc087
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
  
  643cc087
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · f90a773c
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  f90a773c
- make memeber public · bc739129
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
  
  bc739129
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 4d479161
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  4d479161
- bug#28717, make sure only master updates activeStatus · 32c1b70e
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
```
  so that othernodes dont get confused after having recevied status from master
  and then tries to update it self
```
  32c1b70e
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 222940c8
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  222940c8
- Bug #28719: multi pk update ignore corrupts data · 186d1534
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
```
- check multi update as well as update
- this bug is not present in 5.0, but execution patch is wrong, so there are probably other bugs
```
  186d1534
- Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · b46465f3
  tomas@whalegate.ndb.mysql.com authored May 28, 2007
```
- correction, backport to 5.0
```
  b46465f3
24 May, 2007 2 commits
- Bug #28653 Fast GCP + high load + high RedoBuffer causes ndbrequire · 259d7deb
  tomas@whalegate.ndb.mysql.com authored May 24, 2007
```
- correction, use recomputed _actual_ redobuffer
```
  259d7deb
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 95ae6e68
  tomas@whalegate.ndb.mysql.com authored May 24, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  95ae6e68
23 May, 2007 4 commits
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines · 43b2dc18
  svoj@june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  43b2dc18
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · 122167bb
  svoj@mysql.com/june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  122167bb
- Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 · a4ddc226
  svoj@mysql.com/june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
```
  a4ddc226
- remove some not used code · 599d0771
  tomas@whalegate.ndb.mysql.com authored May 23, 2007
  
  599d0771
22 May, 2007 3 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · b7894527
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  b7894527
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 481b314e
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  481b314e
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · 7b2c430f
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
  7b2c430f
21 May, 2007 6 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 · b3a84ddd
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  b3a84ddd
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 99488b31
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
```
  99488b31
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 · 2c3bebc5
  tsmith@quadxeon.mysql.com authored May 21, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
```
  2c3bebc5
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · 709cfbc1
  tomas@whalegate.ndb.mysql.com authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  709cfbc1
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 11feedf0
  tomas@whalegate.ndb.mysql.com authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  11feedf0
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · 9f1cba8e
  tomas@whalegate.ndb.mysql.com authored May 21, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
  9f1cba8e
19 May, 2007 2 commits
- Merge pilot.blaudden:/home/msvensson/mysql/bug28401/my50-bug28401 · a3bd5884
  msvensson@pilot.blaudden authored May 19, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  a3bd5884
- Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE · bc69d072
  msvensson@pilot.blaudden authored May 19, 2007
```
 - The SQL commands used by mysql_upgrade are written to be run
    with sql_mode set to '' - thus the scripts should change sql_mode
    for the session to make sure the SQL is legal.
```
  bc69d072
18 May, 2007 7 commits
- Merge bk@192.168.21.1:mysql-5.0-opt · d5685d4c
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  d5685d4c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c7a45473
  serg@sergbook.mysql.com authored May 18, 2007
```
into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
```
  c7a45473
- added cleanup to some tests · 11e5fa8f
  serg@sergbook.mysql.com authored May 18, 2007
  
  11e5fa8f
- Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · 093b0deb
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  093b0deb
- Merge bk@192.168.21.1:mysql-5.0 · 8b21517d
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  8b21517d
- Merge bk@192.168.21.1:mysql-4.1 · 38c8951d
  holyfoot/hf@mysql.com/hfmain.(none) authored May 18, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
```
  38c8951d
- Merge bk-internal:/home/bk/mysql-5.0-maint · 01ae0807
  msvensson@pilot.blaudden authored May 18, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  01ae0807