Commits · 1e38c22ef8d35e51d4633ee95556ea74782bab20 · Kirill Smelkov / mariadb

10 Apr, 2007 2 commits
- Small fixes for merge. · 1e38c22e
  jani@ua141d10.elisa.omakaista.fi authored Apr 10, 2007
  
  1e38c22e
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · b4ba8159
  jani@ua141d10.elisa.omakaista.fi authored Apr 10, 2007
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
```
  b4ba8159
09 Apr, 2007 5 commits
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 26d2908c
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  26d2908c
- Merge bk@192.168.21.1:mysql-5.0-opt · bd461b01
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  bd461b01
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 87daef26
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  87daef26
- Merge bk@192.168.21.1:mysql-5.1 · 33ed2ead
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  33ed2ead
- Merge bk@192.168.21.1:mysql-5.0 · 65535824
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  65535824
08 Apr, 2007 2 commits
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · a16289d5
  kent@kent-amd64.(none) authored Apr 08, 2007
```
into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
```
  a16289d5
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · c282dd37
  kent@mysql.com/kent-amd64.(none) authored Apr 08, 2007
```
into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
```
  c282dd37
07 Apr, 2007 11 commits
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d8e6b38e
  evgen@moonbone.local authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
```
  d8e6b38e
- merging fix · 171f8bad
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 08, 2007
  
  171f8bad
- after-merging fix · 7ceefd2b
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 07, 2007
  
  7ceefd2b
- Merge mysql.com:/home/hf/work/26074/my51-26074 · 6ffa4b9c
  holyfoot/hf@hfmain.(none) authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  6ffa4b9c
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · fa153792
  holyfoot/hf@hfmain.(none) authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  fa153792
- Merge bk@192.168.21.1:mysql-5.1-opt · ce426dd6
  holyfoot/hf@hfmain.(none) authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  ce426dd6
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · e782e5d5
  tomas@whalegate.ndb.mysql.com authored Apr 07, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
```
  e782e5d5
- Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · 1bc1eecd
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  1bc1eecd
- Merge bk@192.168.21.1:mysql-5.0 · 2a5bcc3f
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  2a5bcc3f
- Merge bk@192.168.21.1:mysql-4.1 · df913ae0
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
```
  df913ae0
- test temporarily disabled · 4a82c460
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 07, 2007
  
  4a82c460
06 Apr, 2007 17 commits
- disabled test and feature · 254ad343
  tomas@whalegate.ndb.mysql.com authored Apr 07, 2007
  
  254ad343
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c3d9eeb2
  evgen@moonbone.local authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
```
  c3d9eeb2
- Bug#27586: Wrong autoinc value assigned by LOAD DATA in the · 93c29c10
  evgen@moonbone.local authored Apr 07, 2007
```
NO_AUTO_VALUE_ON_ZERO mode.

The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.

The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.
```
  93c29c10
- Merge xiphis.org:/home/antony/work2/mysql-5.0-engines.merge · c190088d
  acurtis/antony@ltamd64.xiphis.org authored Apr 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
```
  c190088d
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · d62346a4
  tomas@whalegate.ndb.mysql.com authored Apr 06, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  d62346a4
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 35223ca3
  tomas@whalegate.ndb.mysql.com authored Apr 06, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  35223ca3
- Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines · d0e79056
  acurtis/antony@xiphis.org/ltamd64.xiphis.org authored Apr 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
```
  d0e79056
- Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 78734f14
  acurtis/antony@ltamd64.xiphis.org authored Apr 06, 2007
```
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
```
  78734f14
- Merge vajra.(none):/opt/local/work/mysql-5.0-runtime · 1de28a11
  kostja@vajra.(none) authored Apr 06, 2007
```
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
```
  1de28a11
- Polishing: note added. · 09cfc052
  anozdrin/alik@ibm. authored Apr 06, 2007
  
  09cfc052
- Remove a race between Event Scheduler shutdown and SHOW PROCESSLIST. · e974ea5e
  kostja@vajra.(none) authored Apr 06, 2007
```
This will hopefully fix events.test failure on vmware-win32, 
where scheduling is very primitive.
```
  e974ea5e
- Polishing: add comments. · 08b86393
  anozdrin/alik@ibm. authored Apr 06, 2007
  
  08b86393
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · fa23f7e0
  tomas@whalegate.ndb.mysql.com authored Apr 06, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  fa23f7e0
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-runtime · 41907655
  tomas@whalegate.ndb.mysql.com authored Apr 06, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  41907655
- merging fix · acb0a7e0
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 06, 2007
  
  acb0a7e0
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 14de569d
  kostja@vajra.(none) authored Apr 06, 2007
```
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
```
  14de569d
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · d08216f1
  holyfoot/hf@hfmain.(none) authored Apr 06, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  d08216f1
05 Apr, 2007 3 commits
- Fix events.test failure on manu pushbuild hosts (5.1-runtime). · 4ab55835
  kostja@vajra.(none) authored Apr 06, 2007
  
  4ab55835
- A fix for events_trans.test failure on many hosts (5.1-runtime) · b1b0d8d3
  kostja@vajra.(none) authored Apr 06, 2007
  
  b1b0d8d3
- 3d attempt to fix information_schema.test failure on HP-UX. · 3ef7bdd9
  kostja@vajra.(none) authored Apr 06, 2007
```
Apparently it's the only platform in pushbuild where we 
compile without openssl.
```
  3ef7bdd9