Commits · dd71e64ae72bd0cd652a991f65cbe4e0cdfd27a1 · nexedi / MariaDB

14 Feb, 2008 1 commit

Bug#34468 - csv_not_null fails · dd71e64a

pcrews@pcrews-mac-local.local authored Feb 14, 2008

Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
of expecting warning and re-recorded .result file.

dd71e64a

07 Feb, 2008 10 commits
- Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean · 159bc5c7
  hhunger@hh-nb.hungers authored Feb 07, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-build
```
  159bc5c7
- Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build · 51f2f81d
  msvensson@pilot.mysql.com authored Feb 07, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
```
  51f2f81d
- Merge bk-internal:/home/bk/mysql-5.1-build · 670e938e
  msvensson@pilot.mysql.com authored Feb 07, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
```
  670e938e
- Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025 · 21e767aa
  msvensson@pilot.mysql.com authored Feb 07, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
```
  21e767aa
- Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my51-bug25988 · 8c11d95f
  msvensson@pilot.mysql.com authored Feb 07, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
```
  8c11d95f
- Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988 · fc937c52
  msvensson@pilot.mysql.com authored Feb 07, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/bug25988/my51-bug25988
```
  fc937c52
- Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988 · 800725af
  msvensson@pilot.mysql.com authored Feb 07, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
```
  800725af
- Bug#33050 5.0.50 fails many SSL testcases · c409f206
  msvensson@pilot.mysql.com authored Feb 07, 2008
  
  c409f206
- Merge pilot.mysql.com:/data/msvensson/mysql/bug32025/my50-bug32025 · af14030e
  msvensson@pilot.mysql.com authored Feb 07, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
```
  af14030e
- Bug#32025 ndb_waiter does too many roundtrips to ndb_mgmd · 259263da
  msvensson@pilot.mysql.com authored Feb 07, 2008
  
  259263da
06 Feb, 2008 15 commits
- Merge hh-nb.hungers:/work/merge/mysql-5.1-build · 81e68b2d
  hhunger@hh-nb.hungers authored Feb 06, 2008
```
into  hh-nb.hungers:/work/merge/mysql-5.1-bug34190
```
  81e68b2d
- Merge trift2.:/MySQL/M50/push-5.0 · 5d2c9639
  joerg@trift2. authored Feb 06, 2008
```
into  trift2.:/MySQL/M51/push-5.1
```
  5d2c9639
- Merge trift2.:/MySQL/M50/mysql-5.0 · e2b16eca
  joerg@trift2. authored Feb 06, 2008
```
into  trift2.:/MySQL/M50/push-5.0
```
  e2b16eca
- Merge pilot.mysql.com:/data/msvensson/mysql/bug32044/my51-bug32044 · 42bebb4e
  msvensson@pilot.mysql.com authored Feb 06, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
```
  42bebb4e
- Raise version number after cloning 5.0.56 · 21487efe
  jperkin/mysqldev@mysql.com/production.mysql.com authored Feb 06, 2008
  
  21487efe
- Merge pilot.mysql.com:/data/msvensson/mysql/bug19911/my51-bug19911 · 6ee61e11
  msvensson@pilot.mysql.com authored Feb 06, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
```
  6ee61e11
- Bug#19911 ndb does not work on sol10 x86 · 784eaab4
  msvensson@pilot.mysql.com authored Feb 06, 2008
  
  784eaab4
- Fixed differences in STATE in result file for bug#34190. · 23ebccac
  hhunger@hh-nb.hungers authored Feb 06, 2008
  
  23ebccac
- Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · b499e62c
  tsmith@ramayana.hindu.god authored Feb 05, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).
```
  b499e62c
- Minor typo fix for mysql-test-run.pl · cb87f97c
  tsmith@ramayana.hindu.god authored Feb 05, 2008
  
  cb87f97c
- Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · 9226a45e
  tsmith@ramayana.hindu.god authored Feb 05, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  9226a45e
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 57add90e
  tsmith@ramayana.hindu.god authored Feb 05, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
  57add90e
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 21817aef
  tsmith@ramayana.hindu.god authored Feb 05, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  21817aef
- Merge solace.(none):/home/mtaylor/src/mysql-5.0-build · e12a6442
  mtaylor@solace.(none) authored Feb 06, 2008
```
into  solace.(none):/home/mtaylor/src/mysql-5.1-build
```
  e12a6442
- Strip comments from queries before explaining them. Fixes BUG#34339 · 9a2090fc
  mtaylor@solace.(none) authored Feb 06, 2008
  
  9a2090fc
05 Feb, 2008 9 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · 8695c8fe
  tsmith@ramayana.hindu.god authored Feb 05, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  8695c8fe
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · c99d06a5
  tsmith@ramayana.hindu.god authored Feb 05, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  c99d06a5
- Merge ramayana.hindu.god:/home/tsmith/m/bk/50 · 6726c9e3
  tsmith@ramayana.hindu.god authored Feb 05, 2008
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
```
  6726c9e3
- Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my50-bug31239 · e3e5a1ee
  msvensson@pilot.mysql.com authored Feb 05, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
```
  e3e5a1ee
- Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239 · 00d1710c
  msvensson@pilot.mysql.com authored Feb 05, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
```
  00d1710c
- Adding some more filtering for tests that kills queries and · ccd53222
  mkindahl@dl145h.mysql.com authored Feb 05, 2008
```
cause sporadic, but benign, errors.
```
  ccd53222
- Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my50-bug31239 · 41f3d00e
  msvensson@pilot.mysql.com authored Feb 05, 2008
```
into  pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239
```
  41f3d00e
- Bug#31239 Test "ndb_views" returns NDB error 4259 "Invalid set of range scan bounds" · 20485108
  msvensson@pilot.mysql.com authored Feb 05, 2008
  
  20485108
- Disabling test case binlog_old_version for embedded server. · 6c6c278e
  mkindahl@dl145h.mysql.com authored Feb 05, 2008
  
  6c6c278e
04 Feb, 2008 5 commits
- Fixing result change after merge. · 1dc96b38
  mkindahl@dl145h.mysql.com authored Feb 04, 2008
  
  1dc96b38
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge · 6f8e6d6a
  mkindahl@dl145h.mysql.com authored Feb 04, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
```
  6f8e6d6a
- Updating result file. · 69fdf679
  mkindahl@dl145h.mysql.com authored Feb 04, 2008
  
  69fdf679
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge · 1604acd9
  mkindahl@dl145h.mysql.com authored Feb 04, 2008
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
```
  1604acd9
- Fixes to make rpl_user test pass in pushbuild. · ed698cf5
  mkindahl@dl145h.mysql.com authored Feb 04, 2008
  
  ed698cf5