Commits · 3397f66ae535e253d08dc7479c39420972743825 · nexedi / MariaDB

14 Dec, 2006 4 commits
- Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · 3397f66a
  gni/root@dev3-221.dev.cn.tlan authored Dec 14, 2006
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715
```
  3397f66a
- Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715 · eb0aec33
  gni/root@dev3-221.dev.cn.tlan authored Dec 14, 2006
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715
```
  eb0aec33
- Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-bug21715 · f4ba8767
  gni/root@dev3-221.dev.cn.tlan authored Dec 14, 2006
```
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715
```
  f4ba8767
- BUG #19146 If Backup parameters incorrectly set, the data nodes can't start. · 975908c1
  gni/root@dev3-221.dev.cn.tlan authored Dec 14, 2006
  
  975908c1
12 Dec, 2006 1 commit
- Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj · 08aac434
  lzhou/zhl@dev3-63.dev.cn.tlan authored Dec 12, 2006
```
into  dev3-63.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug22025
```
  08aac434
06 Dec, 2006 1 commit
- BUG#21715 mgm client command <id|all> STATUS returns "not connected" for non-data nodes · 19e0ae8a
  gni/root@dev3-221.dev.cn.tlan authored Dec 06, 2006
  
  19e0ae8a
01 Dec, 2006 3 commits
- BUG#22025 Return correct error message when transporter error occored · da0ce362
  lzhou/zhl@ts3-34.ts.cn.tlan authored Dec 01, 2006
  
  da0ce362
- For merging mysql-5.1-new-ndb-bj tree into mysql-5.1-new-ndb tree · dfd2c8f4
  gni/root@ts3-168.ts.cn.tlan authored Dec 01, 2006
  
  dfd2c8f4
- Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj · 24b1feea
  gni/root@ts3-168.ts.cn.tlan authored Dec 01, 2006
```
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
```
  24b1feea
30 Nov, 2006 17 commits
- bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · 4b7e0b5f
  mskold/marty@mysql.com/linux.site authored Nov 30, 2006
```
bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated
```
  4b7e0b5f
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · d0a4d0c5
  mskold/marty@linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  d0a4d0c5
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 5f84f3f4
  mskold/marty@linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  5f84f3f4
- bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · aa03fbca
  mskold/marty@mysql.com/linux.site authored Nov 30, 2006
```
bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated
```
  aa03fbca
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 7ef54795
  mskold/marty@linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  7ef54795
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · a6f31175
  mskold/marty@linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  a6f31175
- bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · e71c09b4
  mskold/marty@mysql.com/linux.site authored Nov 30, 2006
```
bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE
```
  e71c09b4
- bug#18487 UPDATE IGNORE not supported for unique constraint violation of... · e576bf7f
  mskold/marty@mysql.com/linux.site authored Nov 30, 2006
```
bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key: updated test result
```
  e576bf7f
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 34cfad64
  mskold/marty@linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  34cfad64
- bug#24303 Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix... · d4a929d7
  mskold/marty@mysql.com/linux.site authored Nov 30, 2006
```
bug#24303  Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix for bug#18487  UPDATE IGNORE not supported for unique constraint violation of non-primary key, solves it a better way
```
  d4a929d7
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · d7e37568
  mskold/marty@linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  d7e37568
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 2a4de6fc
  mskold/marty@linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  2a4de6fc
- #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
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6db1610c
  mskold/marty@linux.site authored Nov 30, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  6db1610c
- Removed return of illegal pointer, changed signatures to... · 9169edf3
  mskold/marty@mysql.com/linux.site authored Nov 30, 2006
```
Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel
```
  9169edf3
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 082de8df
  baker@bk-internal.mysql.com authored Nov 30, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  082de8df
- A post-merge fix: fix the failing trigger-grant.test. · 931cf68b
  kostja@bodhi.local authored Nov 30, 2006
  
  931cf68b
29 Nov, 2006 14 commits
- A post-merge fix. · bdf6d15f
  kostja@bodhi.local authored Nov 30, 2006
  
  bdf6d15f
- A post-merge fix. · 1cee31a6
  kostja@bodhi.local authored Nov 30, 2006
  
  1cee31a6
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9fa2b758
  kostja@bodhi.local authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
```
  9fa2b758
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 4d418e6c
  kostja@bodhi.local authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  4d418e6c
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 726c43cc
  kostja@bodhi.local authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  726c43cc
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 605404ec
  kostja@bodhi.local authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  605404ec
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c6c172e4
  kostja@bodhi.local authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
```
  c6c172e4
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 74e3aa31
  kostja@bodhi.local authored Nov 30, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
```
  74e3aa31
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 966c569b
  kostja@bodhi.local authored Nov 29, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
```
  966c569b
- Many files: · ea5c7f97
  kent@mysql.com/kent-amd64.(none) authored Nov 29, 2006
```
  Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries
```
  ea5c7f97
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 94dc5d53
  baker@bk-internal.mysql.com authored Nov 29, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
  94dc5d53
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · 3881fa9e
  kroki/tomash@moonlight.intranet authored Nov 29, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637
```
  3881fa9e
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637 · e149e6af
  kroki/tomash@moonlight.intranet authored Nov 29, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637
```
  e149e6af
- bug#24303 Wrong result for UPDATE IGNORE for NDB table: Refinement, only read... · 7d86df6a
  mskold/marty@mysql.com/linux.site authored Nov 29, 2006
```
bug#24303  Wrong result for UPDATE IGNORE for NDB table: Refinement, only read all fields for UPDATE IGNORE with pk (check if UPDATE command and pk in write_set)
```
  7d86df6a