Commits · cae7bc8c96017315b194b00a920e179e8b442316 · Kirill Smelkov / mariadb

09 Mar, 2007 1 commit
- Merge mysql.com:/home/hf/work/mysql-5.1 · cae7bc8c
  holyfoot/hf@hfmain.(none) authored Mar 09, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  cae7bc8c
08 Mar, 2007 30 commits
- Merge bk@192.168.21.1:mysql-5.1 · cdcf3ec0
  holyfoot/hf@hfmain.(none) authored Mar 08, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  cdcf3ec0
- The most recent push into mysql-5.1 from mysql-5.2 was a mistake. · 8539d9a7
  tsmith@bk-internal.mysql.com authored Mar 08, 2007
```
This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)
```
  8539d9a7
- merging · 48d3e2c1
  holyfoot/hf@mysql.com/hfmain.(none) authored Mar 08, 2007
  
  48d3e2c1
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · bb273143
  tsmith@bk-internal.mysql.com authored Mar 08, 2007
```
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2
```
  bb273143
- Update result for 5.1 · 4374a470
  msvensson@pilot.blaudden authored Mar 08, 2007
  
  4374a470
- Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 75be7cd1
  holyfoot/hf@hfmain.(none) authored Mar 08, 2007
```
into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
```
  75be7cd1
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · dd16b217
  msvensson@pilot.blaudden authored Mar 08, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  dd16b217
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 433d3e6c
  msvensson@pilot.blaudden authored Mar 08, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  433d3e6c
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 73b5b2ae
  msvensson@pilot.blaudden authored Mar 08, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  73b5b2ae
- Fix 6 warnings from win64, where one is a potential bug. · 8a8c69f3
  msvensson@pilot.blaudden authored Mar 08, 2007
  
  8a8c69f3
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 27392467
  msvensson@pilot.blaudden authored Mar 08, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  27392467
- Merge bk-internal:/home/bk/mysql-5.0-maint · 49d86223
  msvensson@pilot.blaudden authored Mar 08, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  49d86223
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 03034292
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
```
  03034292
- comp_err.c: return ha_checksum from checksum_format_specifier() - more... · fee7ab58
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
comp_err.c:  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning
```
  fee7ab58
- Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074 · ec871681
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
  
  ec871681
- Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint · 8a065c02
  tulin/mysqldev@production.mysql.com authored Mar 08, 2007
```
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint
```
  8a065c02
- Merge bk-internal:/home/bk/mysql-5.1-new-ndb · ecd1dd17
  tulin/mysqldev@mysql.com/production.mysql.com authored Mar 08, 2007
```
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint
```
  ecd1dd17
- Merge bk-internal:/home/bk/mysql-5.0-ndb · 34c3cd81
  tulin/mysqldev@mysql.com/production.mysql.com authored Mar 08, 2007
```
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
```
  34c3cd81
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50 · 55aea401
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
```
  55aea401
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 82c403e6
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
```
  82c403e6
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · a4ca7e7c
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
```
  a4ca7e7c
- Merge poseidon.mysql.com:/home/tomas/mysql-5.1 · 8370b2c5
  tomas@poseidon.mysql.com authored Mar 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  8370b2c5
- Merge poseidon.mysql.com:/home/tomas/mysql-5.0 · 948ed82a
  tomas@poseidon.mysql.com authored Mar 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
```
  948ed82a
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · faecfb44
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
```
  faecfb44
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/misc/51-fedfix · ae941921
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
```
  ae941921
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/50 · 809f9f00
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
```
  809f9f00
- Bug #26940: CREATE SERVER does not initialize record[0] in insert_server_record() · 0cd9897e
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
sql_servers.cc:insert_server_record():  initialize record[0] before inserting row
```
  0cd9897e
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41 · d093ba47
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
```
  d093ba47
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/40 · 5959e8a6
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
```
  5959e8a6
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · de61dde9
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
```
  de61dde9
07 Mar, 2007 9 commits
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 6661e6b4
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
```
  6661e6b4
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · ba22ad70
  tsmith@quadxeon.mysql.com authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
```
  ba22ad70
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50 · 54c59e61
  tsmith@quadxeon.mysql.com authored Mar 07, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
```
  54c59e61
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · c06499b2
  tsmith@quadxeon.mysql.com authored Mar 07, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50
```
  c06499b2
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40 · a5e0f606
  tsmith@quadxeon.mysql.com authored Mar 07, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/40
```
  a5e0f606
- update test results for bdb_gis after merge of fix for b26038 · 4656023e
  tsmith@quadxeon.mysql.com authored Mar 07, 2007
  
  4656023e
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 106f1a7b
  kent@kent-amd64.(none) authored Mar 07, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  106f1a7b
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1c09a96c
  kent@kent-amd64.(none) authored Mar 07, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  1c09a96c
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 781b271c
  kent@mysql.com/kent-amd64.(none) authored Mar 07, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
  781b271c