Commits · 638c294b7f0ce9687e73cc5553296f4d50753f25 · Kirill Smelkov / mariadb

30 Nov, 2006 2 commits
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 638c294b
  mskold/marty@mysql.com/linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  638c294b
- #18487 UPDATE IGNORE not supported for unique constraint violation of... · af324d9c
  mskold/marty@mysql.com/linux.site authored Nov 30, 2006
```
#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows
```
  af324d9c
29 Nov, 2006 1 commit
- bug#24303 Wrong result for UPDATE IGNORE for NDB table: Added test case · ae0d7e87
  mskold/marty@mysql.com/linux.site authored Nov 29, 2006
  
  ae0d7e87
21 Nov, 2006 2 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 1d041fa5
  jonas@perch.ndb.mysql.com authored Nov 21, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  1d041fa5
- ndb - · ac79cbb1
  jonas@perch.ndb.mysql.com authored Nov 21, 2006
```
  Fix bug wrt to '\r' handling in latest commit to bug#24011
```
  ac79cbb1
16 Nov, 2006 1 commit
- Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb · 5e6b5872
  pekka@orca.ndb.mysql.com authored Nov 16, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc
```
  5e6b5872
14 Nov, 2006 2 commits
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · a40f5dfb
  mskold/marty@mysql.com/linux.site authored Nov 14, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  a40f5dfb
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c3cb3d8
  mskold/marty@mysql.com/linux.site authored Nov 14, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  7c3cb3d8
13 Nov, 2006 2 commits
- Fix for Bug #23887 (Introduced by Bugfix #22295) · 63968391
  hartmut@mysql.com/linux.site authored Nov 13, 2006
  
  63968391
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · b045a815
  mskold/marty@mysql.com/linux.site authored Nov 13, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  b045a815
12 Nov, 2006 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f455a81
  kostja@bodhi.local authored Nov 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  0f455a81
11 Nov, 2006 3 commits
- Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 1319f355
  kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 11, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
  1319f355
- mysql-test-run.pl: · cddbb0f8
  kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 11, 2006
```
  Test for base directory when a RPM install corrected
```
  cddbb0f8
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0cdaa7c1
  kostja@bodhi.local authored Nov 11, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  0cdaa7c1
10 Nov, 2006 15 commits
- Merge trift2.:/M50/mysql-5.0 · a19a5b5f
  joerg@trift2. authored Nov 10, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  a19a5b5f
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · b2da711f
  tsmith@quadxeon.mysql.com authored Nov 10, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
  b2da711f
- Merge trift2.:/MySQL/M50/bug24023-5.0 · e47f753a
  joerg@trift2. authored Nov 10, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  e47f753a
- Merge trift2.:/MySQL/M41/push-4.1 · 32d9fdaa
  joerg@trift2. authored Nov 10, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  32d9fdaa
- Merge trift2.:/MySQL/M41/bug17194-4.1 · 743ab0c6
  joerg@trift2. authored Nov 10, 2006
```
into  trift2.:/MySQL/M41/push-4.1
```
  743ab0c6
- Merge trift2.:/MySQL/M41/clone-4.1 · 2ab3d0bf
  joerg@trift2. authored Nov 10, 2006
```
into  trift2.:/MySQL/M41/push-4.1
```
  2ab3d0bf
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · a185c4f6
  df@kahlann.erinye.com authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
```
  a185c4f6
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 403ecf18
  df@kahlann.erinye.com authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
  403ecf18
- Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · 59e33edf
  df@kahlann.erinye.com authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
  59e33edf
- add --report-features to mysql-test-run.pl · f1764fa9
  df@kahlann.erinye.com authored Nov 10, 2006
  
  f1764fa9
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e06f74f9
  petr/cps@outpost.site authored Nov 10, 2006
```
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
```
  e06f74f9
- Memory allocation bug fixed · bc9ca699
  ted@ted.mysql.internal authored Nov 10, 2006
  
  bc9ca699
- Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic · 54f6fc07
  kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
  54f6fc07
- Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic · 264beeff
  kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
```
  264beeff
- mysql-test-run.sh: · f8931288
  kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 10, 2006
```
  Added --force-restart pseudo server argument to shell version as well
```
  f8931288
09 Nov, 2006 4 commits

mysql-test/install_test_db.sh · dce6efd0

joerg@trift2. authored Nov 09, 2006

    Adapt to the different path of the server program, if installation was by RPM.
    Missing in the first changeset for bug#17194.

dce6efd0

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41 · e9b42a4b
tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50
```
e9b42a4b
This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33 · c2aca91b
tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
Fixes:
- Bug #24089: Race condition in fil_flush_file_spaces()
```
c2aca91b

This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 · f1e0cf9d

tsmith@quadxeon.mysql.com authored Nov 09, 2006

Fixes:
- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #23769: Debug assertion failure with innodb_locks_unsafe_for_binlog
- Bug #24089: Race condition in fil_flush_file_spaces()

f1e0cf9d

08 Nov, 2006 7 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 · 41117b12
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
  41117b12
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41 · 246ec191
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
```
  246ec191
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50 · f663ba45
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
  f663ba45
- Fix warnings and NetWare compile failure · f032a223
  msvensson@neptunus.(none) authored Nov 09, 2006
  
  f032a223
- Merge bk-internal:/home/bk/mysql-5.0-maint · 0ec64326
  msvensson@neptunus.(none) authored Nov 08, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  0ec64326
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · a620a3ab
  msvensson@neptunus.(none) authored Nov 08, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  a620a3ab
- Update of --mem flag after comments · 90d8d7b5
  msvensson@neptunus.(none) authored Nov 08, 2006
  
  90d8d7b5