Commits · 1834530549a2fba689787dad476dda082b8e1013 · nexedi / MariaDB

10 Apr, 2007 13 commits
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 18345305
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  18345305
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 · 448a6778
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  448a6778
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 · d549e480
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  d549e480
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · d4f01284
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  d4f01284
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 829ca34d
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  829ca34d
- Add --logdir option ot mysqltest · 5c527175
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  5c527175
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 4496a8f5
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  4496a8f5
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 34a784f3
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  34a784f3
- Merge 192.168.0.4:mysql/mysql-4.1-maint · 60eb839e
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  60eb839e
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · d08e3529
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  d08e3529
- Give the "sync_slave_with_master" something to do · 9f11d74c
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  9f11d74c
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 60682755
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
```
  60682755
- Merge bk-internal:/home/bk/mysql-5.0-maint · 7cf3a2a6
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  7cf3a2a6
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 9 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