Commits · 1b6a0171551a85b8fcb1b906f319455d71fe30c5 · Kirill Smelkov / mariadb

22 Jun, 2006 3 commits
- Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1b6a0171
  mats@romeo.(none) authored Jun 22, 2006
```
into  mysql.com:/home/bk/fix-mysql-5.1
```
  1b6a0171
- Patch to handle some bad situations resulting from the fix for BUG#19995. · 3b830e4b
  mats@mysql.com authored Jun 22, 2006
  
  3b830e4b
- Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 · 5eea9720
  joerg@trift2. authored Jun 22, 2006
  
  5eea9720
21 Jun, 2006 25 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · d9fb74e4
  rburnett@bk-internal.mysql.com authored Jun 22, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  d9fb74e4
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 9543cae6
  mikael@dator5.(none) authored Jun 21, 2006
```
into  dator5.(none):/home/pappa/bug19281
```
  9543cae6
- mmanual merge · cb504319
  mikael@dator5.(none) authored Jun 21, 2006
  
  cb504319
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 8472ce9f
  rburnett@bk-internal.mysql.com authored Jun 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  8472ce9f
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · eab0cfbc
  mikael@dator5.(none) authored Jun 21, 2006
```
into  dator5.(none):/home/pappa/bug19281
```
  eab0cfbc
- Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51 · 43409d98
  pekka@orca.ndb.mysql.com authored Jun 21, 2006
```
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18102
```
  43409d98
- ndb - add test_event_merge to daily-devel-tests.txt · 7f9bfc20
  pekka@clam.ndb.mysql.com authored Jun 21, 2006
  
  7f9bfc20
- BUG#19309: Problem with calling proecdures twice · de9eb496
  mikael@dator5.(none) authored Jun 21, 2006
```
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
```
  de9eb496
- ndb - bug#18102: fixes on NDB API level · 6ba2b184
  pekka@clam.ndb.mysql.com authored Jun 21, 2006
  
  6ba2b184
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3228ce7f
  ramil@myoffice.izhnet.ru authored Jun 21, 2006
```
into  mysql.com:/usr/home/ram/work/mysql-5.1
```
  3228ce7f
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 5a558eaf
  rburnett@bk-internal.mysql.com authored Jun 21, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  5a558eaf
- After merge fix · 207c0baf
  lars@mysql.com authored Jun 21, 2006
  
  207c0baf
- Fix for bug #20601: rpl_ndb_log.test failure · db2acfc9
  ramil@mysql.com authored Jun 21, 2006
  
  db2acfc9
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 6b8c1965
  lars@mysql.com authored Jun 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  6b8c1965
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · ed0e9852
  lars@dl145j.mysql.com authored Jun 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  ed0e9852
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 6839e642
  lars@mysql.com authored Jun 21, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  6839e642
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · a2fad11c
  mskold@linux.site authored Jun 21, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  a2fad11c
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · c360810d
  tomas@poseidon.ndb.mysql.com authored Jun 21, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  c360810d
- after merge fixes · 8097ba20
  gluh@eagle.intranet.mysql.r18.ru authored Jun 21, 2006
  
  8097ba20
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7704d973
  mskold@linux.site authored Jun 21, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  7704d973
- Fixed failed automerge · 7fdf6f16
  mskold@mysql.com authored Jun 21, 2006
  
  7fdf6f16
- Disable IM tests. · 5ce56c1c
  anozdrin@mysql.com authored Jun 21, 2006
  
  5ce56c1c
- Merge mysql.com:/home/marty/MySQL/mysql-5.0-backed · bd3f9cc0
  mskold@mysql.com authored Jun 21, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  bd3f9cc0
- Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly · e77850e5
  mskold@mysql.com authored Jun 21, 2006
  
  e77850e5
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · f072f7cb
  tomas@poseidon.ndb.mysql.com authored Jun 21, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  f072f7cb
20 Jun, 2006 12 commits
- Re-enable IM tests. · bb94cb24
  anozdrin@mysql.com authored Jun 21, 2006
  
  bb94cb24
- Fix merge 5.0 -> 5.1. · ddaebd13
  anozdrin@mysql.com authored Jun 21, 2006
  
  ddaebd13
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 3a6ad23f
  anozdrin@booka.site authored Jun 21, 2006
```
into  mysql.com:/home/alik/MySQL/devel/5.1-merged
```
  3a6ad23f
- rpl_ndb_log.result: · 6b694bcd
  evgen@moonbone.local authored Jun 21, 2006
```
  Corrected test case result
```
  6b694bcd
- Merge dator5.(none):/home/pappa/bug16000 · da260e9e
  mikael@dator5.(none) authored Jun 20, 2006
```
into  dator5.(none):/home/pappa/bug19281
```
  da260e9e
- Fix for bug#18516 (also #19353, reported for 5.1): · 27df8b07
  joerg@mysql.com authored Jun 20, 2006
```
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
```
  27df8b07
- BUG#16000: .par file left behind plus unnecessary messages to error.log · a3d5c3bf
  mikael@dator5.(none) authored Jun 20, 2006
```
New test cases
```
  a3d5c3bf
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 3505cdb0
  mikael@dator5.(none) authored Jun 20, 2006
```
into  dator5.(none):/home/pappa/bug16000
```
  3505cdb0
- Merge dator5.(none):/home/pappa/bug19309 · 4f599159
  mikael@dator5.(none) authored Jun 20, 2006
```
into  dator5.(none):/home/pappa/bug19281
```
  4f599159
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 39b9c16e
  mikael@dator5.(none) authored Jun 20, 2006
```
into  dator5.(none):/home/pappa/bug19309
```
  39b9c16e
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 4dd8f909
  mikael@dator5.(none) authored Jun 20, 2006
```
into  dator5.(none):/home/pappa/bug19281
```
  4dd8f909
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 0865a5da
  tomas@poseidon.ndb.mysql.com authored Jun 20, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  0865a5da