Commits · a45234789397cfb9f9bc2d2a8bcc5565b057556e · Kirill Smelkov / mariadb

11 Dec, 2007 4 commits
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · a4523478
  mskold/marty@quadfish.(none) authored Dec 11, 2007
```
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
```
  a4523478
- Enabled test rpl_ndb_ddl · 4f8101c8
  mskold/marty@mysql.com/quadfish.(none) authored Dec 11, 2007
  
  4f8101c8
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e56c24d4
  tomas@whalegate.ndb.mysql.com authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
  e56c24d4
- remoce compiler warnings · 9a189642
  tomas@whalegate.ndb.mysql.com authored Dec 11, 2007
  
  9a189642
10 Dec, 2007 7 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · 57c890d5
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  57c890d5
- backport test for bug#30674 · 4740565e
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
(bug not present in 5.1)
```
  4740565e
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 53dabdd3
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  53dabdd3
- Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · 541db601
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  541db601
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · ddbb4d42
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  ddbb4d42
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 9eb0ef89
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  9eb0ef89
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · ae7d4929
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  ae7d4929
07 Dec, 2007 18 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 31a4940b
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  31a4940b
- Add a way to remove options which mysql-test-run.pl no longer uses. · 4eb097ba
  tsmith@ramayana.hindu.god authored Dec 07, 2007
  
  4eb097ba
- Removed illegal cast · 0c628827
  mskold/marty@mysql.com/quadfish.(none) authored Dec 07, 2007
  
  0c628827
- Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb · 9532e822
  mskold/marty@quadfish.(none) authored Dec 07, 2007
```
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
```
  9532e822
- Removed illegal cast · 4619caa5
  mskold/marty@mysql.com/quadfish.(none) authored Dec 07, 2007
  
  4619caa5
- Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb · 844936ab
  mskold/marty@quadfish.(none) authored Dec 07, 2007
```
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
```
  844936ab
- Removed illegal cast · 6047fb2e
  mskold/marty@mysql.com/quadfish.(none) authored Dec 07, 2007
  
  6047fb2e
- bug#21072 Duplicate key error in NDB references wrong key: regenerated result · 4dcfb096
  mskold/marty@mysql.com/quadfish.(none) authored Dec 07, 2007
  
  4dcfb096
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 3b45ef82
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  3b45ef82
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3d01ffd7
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  3d01ffd7
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8c5f1945
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  8c5f1945
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 04d363d1
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
```
  04d363d1
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · bf6292ea
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  bf6292ea
- Make tests more robust (clean up better after grant.test) · 6835272b
  tsmith@ramayana.hindu.god authored Dec 07, 2007
  
  6835272b
- bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes · af908e61
  mskold/marty@mysql.com/quadfish.(none) authored Dec 07, 2007
  
  af908e61
- Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb · e051994b
  mskold/marty@quadfish.(none) authored Dec 07, 2007
```
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
```
  e051994b
- bug#21072 Duplicate key error in NDB references wrong key: Post-review fixes · fc6f839b
  mskold/marty@mysql.com/quadfish.(none) authored Dec 07, 2007
  
  fc6f839b
- Move the test case for bug #20901 from create.test to grant.test, so · 45c78260
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
testing embedded server works correctly.
```
  45c78260
06 Dec, 2007 3 commits
- Fix compiler warning about wrong integer size (probably harmless) · b922c964
  tsmith@ramayana.hindu.god authored Dec 06, 2007
  
  b922c964
- ctype-simple.c: Backport quick fix to remove Windows compiler warnings · 44d74f63
  tsmith@ramayana.hindu.god authored Dec 06, 2007
  
  44d74f63
- bug#21072 Duplicate key error in NDB references wrong key: Return correct key... · 27c02506
  mskold/marty@mysql.com/quadfish.(none) authored Dec 06, 2007
```
bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts
```
  27c02506
05 Dec, 2007 8 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · ac811ce4
  tsmith@ramayana.hindu.god authored Dec 05, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
```
  ac811ce4
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · f1323ad6
  tsmith@ramayana.hindu.god authored Dec 05, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  f1323ad6
- Post-merge fix (reorder tests in ctype_ucs.test) · c3a0572d
  tsmith@ramayana.hindu.god authored Dec 05, 2007
  
  c3a0572d
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 8fc0bfb6
  tsmith@ramayana.hindu.god authored Dec 05, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
```
  8fc0bfb6
- Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1 · aa5786eb
  davi@endora.local authored Dec 05, 2007
```
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
```
  aa5786eb
- Bug#32996 log_tables.test fails sporadically · b79b57c6
  davi@mysql.com/endora.local authored Dec 05, 2007
```
Only select entries from the general_log that were issued by the current
connection.
```
  b79b57c6
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 10cab933
  tsmith@ramayana.hindu.god authored Dec 04, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  10cab933
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 64530251
  tsmith@ramayana.hindu.god authored Dec 04, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
```
  64530251