Commits · 3d847358ded8e4d73f1ee20dc563cf39933fed54 · Kirill Smelkov / mariadb

10 Apr, 2007 13 commits
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 3d847358
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  3d847358
- Take into account wether vertical_results are in effect · 9917d018
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  9917d018
- Init dying to 1 just after passing the guard · 73c6cde9
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  73c6cde9
- Add OPT_LOG_DIR · da2a2168
  msvensson@pilot.blaudden authored Apr 10, 2007
  
  da2a2168
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · c30b6880
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  c30b6880
- 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-4.1 · f194cbe6
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
```
  f194cbe6
- 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-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
- 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.0-maint · 7cf3a2a6
  msvensson@pilot.blaudden authored Apr 10, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  7cf3a2a6
09 Apr, 2007 2 commits
- 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 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 1 commit
- 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 4 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
- 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
06 Apr, 2007 6 commits
- 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 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
- Polishing: note added. · 09cfc052
  anozdrin/alik@ibm. authored Apr 06, 2007
  
  09cfc052
- Polishing: add comments. · 08b86393
  anozdrin/alik@ibm. authored Apr 06, 2007
  
  08b86393
05 Apr, 2007 14 commits
- Add "query_sorted" command to mysqltest · 2df85243
  msvensson@shellback.(none) authored Apr 05, 2007
```
Usage:
  query_sorted <query>;
```
  2df85243
- Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · c3dc142d
  msvensson@pilot.blaudden authored Apr 05, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
```
  c3dc142d
- Protect against dying twice · 9cd8b2b8
  msvensson@pilot.blaudden authored Apr 05, 2007
```
Cleanup exit handling
```
  9cd8b2b8
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 77a1d31f
  tomas@whalegate.ndb.mysql.com authored Apr 05, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  77a1d31f
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a858e44a
  tomas@whalegate.ndb.mysql.com authored Apr 05, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  a858e44a
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · bcac9141
  mskold/marty@mysql.com/linux.site authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  bcac9141
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · ffba5243
  tomas@whalegate.ndb.mysql.com authored Apr 05, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  ffba5243
- set name for ndb tools · ee57ca9d
  tomas@whalegate.ndb.mysql.com authored Apr 05, 2007
  
  ee57ca9d
- Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld · 292929bc
  tomas@whalegate.ndb.mysql.com authored Apr 05, 2007
```
- test case workaround to avoid random failures
```
  292929bc
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 3e8cf595
  mskold/marty@mysql.com/linux.site authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  3e8cf595
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · b3ce0177
  mskold/marty@mysql.com/linux.site authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  b3ce0177
- Removed compiler warnings · ee034c0e
  mskold/marty@mysql.com/linux.site authored Apr 05, 2007
  
  ee034c0e
- Fixed compilation error on Windows · 84eb172c
  mskold/marty@mysql.com/linux.site authored Apr 05, 2007
  
  84eb172c
- Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb · c7da27b5
  Justin.He/justin.he@dev3-240.dev.cn.tlan authored Apr 05, 2007
```
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
```
  c7da27b5