Commits · b3917e94fadd1fe6aa66fda0f438cb6b02ffc69e · nexedi / MariaDB

13 Jun, 2007 9 commits
- Merge trift2.:/MySQL/M50/push-5.0 · b3917e94
  joerg@trift2. authored Jun 13, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  b3917e94
- Merge trift2.:/MySQL/M41/push-4.1 · a4494a1b
  joerg@trift2. authored Jun 13, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  a4494a1b
- Merge trift2.:/MySQL/M50/merge-5.0 · f004ab37
  joerg@trift2. authored Jun 13, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  f004ab37
- Merge trift2.:/MySQL/M51/merge-5.1 · 4d8632f2
  joerg@trift2. authored Jun 13, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  4d8632f2
- Merge trift2.:/MySQL/M50/push-5.0 · 536ea333
  joerg@trift2. authored Jun 13, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  536ea333
- Merge trift2.:/MySQL/M50/merge-5.0 · 4ed489d6
  joerg@trift2. authored Jun 13, 2007
```
into  trift2.:/MySQL/M51/merge-5.1
```
  4ed489d6
- Merge trift2.:/MySQL/M41/tmp-4.1 · 36adff6d
  joerg@trift2. authored Jun 13, 2007
```
into  trift2.:/MySQL/M50/merge-5.0
```
  36adff6d
- Merge trift2.:/MySQL/M41/tmp-4.1 · a4a2c720
  joerg@trift2. authored Jun 13, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  a4a2c720
- sql/item_func.cc · 018a5d40
  joerg@trift2. authored Jun 13, 2007
```
    Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.
```
  018a5d40
12 Jun, 2007 1 commit
- make_win_bin_dist: · affeddbd
  kent@mysql.com/kent-amd64.(none) authored Jun 12, 2007
```
  Aligned headers to include with Unix 'make install'
```
  affeddbd
11 Jun, 2007 2 commits
- Merge trift2.:/MySQL/M50/push-5.0 · ed583630
  joerg@trift2. authored Jun 11, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  ed583630
- Merge trift2.:/MySQL/M41/push-4.1 · 07785ec5
  joerg@trift2. authored Jun 11, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  07785ec5
08 Jun, 2007 1 commit
- Add a cast, needed by some platforms. · 2d718ff1
  joerg@trift2. authored Jun 08, 2007
```
Still part of the fix for bug#27078.
```
  2d718ff1
07 Jun, 2007 5 commits
- Do not use the "thd" pointer to identify a thread in the embedded lib, · ab64b2f8
  joerg@trift2. authored Jun 07, 2007
```
but rather use the "thread_id" counter.

Fixes bug#27078:
Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision
```
  ab64b2f8
- Merge trift2.:/MySQL/M41/bug23504-4.1 · 160b784a
  joerg@trift2. authored Jun 07, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  160b784a
- Merge trift2.:/MySQL/M50/push-5.0 · ee116570
  joerg@trift2. authored Jun 07, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  ee116570
- Merge trift2.:/MySQL/M41/bug23504-4.1 · d870247d
  joerg@trift2. authored Jun 07, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  d870247d
- netware/*.def : Allocate 128K stack for all executables (bug#23504) · 0d84c3f7
  joerg@trift2. authored Jun 07, 2007
  
  0d84c3f7
06 Jun, 2007 12 commits
- Merge trift2.:/MySQL/M41/mysql-4.1 · 111212aa
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  111212aa
- Merge trift2.:/MySQL/M50/mysql-5.0 · d8c385c3
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  d8c385c3
- Merge trift2.:/MySQL/M51/mysql-5.1 · 449cd285
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  449cd285
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 75ed2c7d
  tsmith@quadxeon.mysql.com authored Jun 06, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
```
  75ed2c7d
- Merge trift2.:/MySQL/M50/push-5.0 · 66a17c58
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  66a17c58
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 016cf698
  tomas@whalegate.ndb.mysql.com authored Jun 06, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
```
  016cf698
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-build · 7b285522
  tomas@whalegate.ndb.mysql.com authored Jun 06, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
```
  7b285522
- Merge trift2.:/MySQL/M41/push-4.1 · 86fbe0bd
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  86fbe0bd
- Merge trift2.:/MySQL/M41/mysql-4.1 · fef905d0
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  fef905d0
- Raise version number after cloning 4.1.23 · 0067a9cc
  joerg/mysqldev@mysql.com/production.mysql.com authored Jun 06, 2007
  
  0067a9cc
- Merge trift2.:/MySQL/M50/mysql-5.0 · 3d95b80d
  joerg@trift2. authored Jun 06, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  3d95b80d
- mtr_report.pl: · 13adcedc
  tsmith@quadxeon.mysql.com authored Jun 06, 2007
```
  Add another exception to the acceptable mysqld errors, for test case for bug 28436
```
  13adcedc
05 Jun, 2007 10 commits
- ctype-bin.c: · 60f6e71e
  tsmith@quadxeon.mysql.com authored Jun 06, 2007
```
  Post-merge fix warning
```
  60f6e71e
- sql_prepare.cc: · 6d867907
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
  Post-merge fix (byte -> uchar)
```
  6d867907
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · dad35dc1
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
```
  dad35dc1
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0ca0984f
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
```
  0ca0984f
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · d2fe24d1
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
  d2fe24d1
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50 · 016bff8a
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
```
  016bff8a
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 · 173d07de
  tsmith@quadxeon.mysql.com authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
  173d07de
- Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca · 8fd5212a
  tomas@poseidon.mysql.com authored Jun 05, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  8fd5212a
- Merge trift2.:/MySQL/M51/clone-5.1 · 27f907b7
  joerg@trift2. authored Jun 05, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  27f907b7
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · ce93bc3d
  tomas@poseidon.mysql.com authored Jun 05, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
```
  ce93bc3d