Commits · ad1abb3cb337cbe756c18270698afe07d35278a2 · Kirill Smelkov / mariadb

18 Dec, 2006 5 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · ad1abb3c
  df@kahlann.erinye.com authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  ad1abb3c
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 5ad288f1
  df@kahlann.erinye.com authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  5ad288f1
- Use a temporary directory for sockets if the socket path becomes too long. · 4a98f36e
  df@kahlann.erinye.com authored Dec 18, 2006
  
  4a98f36e
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · c78b3c4e
  df@kahlann.erinye.com authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  c78b3c4e
- support-files/mysql.spec.sh · 534b2ca0
  joerg@trift2. authored Dec 18, 2006
```
    Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
```
  534b2ca0
15 Dec, 2006 3 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 6a0ce672
  df@kahlann.erinye.com authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  6a0ce672
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · c4676b69
  df@kahlann.erinye.com authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  c4676b69
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 91143541
  df@kahlann.erinye.com authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  91143541
14 Dec, 2006 9 commits
- Merge trift2.:/MySQL/M41/spec-4.1 · 9b8c7ffc
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M41/push-4.1
```
  9b8c7ffc
- Merge trift2.:/MySQL/M50/spec-5.0 · daba0ecb
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  daba0ecb
- support-files/mysql.spec.sh · a62051b7
  joerg@trift2. authored Dec 14, 2006
```
    The "mysqlmanager" man page got moved from section 1 to 8.
```
  a62051b7
- Merge trift2.:/MySQL/M41/spec-4.1 · 8bdcf736
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M50/spec-5.0
```
  8bdcf736
- support-files/mysql.spec.sh · 5582d601
  joerg@trift2. authored Dec 14, 2006
```
    The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
```
  5582d601
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 02d6bcaa
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  02d6bcaa
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 0231b019
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  0231b019
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 · 9497df0b
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  9497df0b
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 95564bfe
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  95564bfe
12 Dec, 2006 3 commits
- BUG#24902 in 5.0 · bd44245e
  df@kahlann.erinye.com authored Dec 12, 2006
  
  bd44245e
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 635a5641
  gluh@mysql.com/gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  635a5641
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 118a0c7f
  gluh@mysql.com/gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  118a0c7f
11 Dec, 2006 3 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · f0f4d3c0
  gluh@mysql.com/gluh.(none) authored Dec 11, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
  f0f4d3c0
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 · 78e1df3e
  df@kahlann.erinye.com authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  78e1df3e
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 476632aa
  df@kahlann.erinye.com authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  476632aa
07 Dec, 2006 6 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 75c71141
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  75c71141
- do not autorelease build ids when a child of mysql-test-run.pl dies · 19ec379b
  df@kahlann.erinye.com authored Dec 07, 2006
  
  19ec379b
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · bb1297cd
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  bb1297cd
- BUG#24780 use --sysconfdir in scripts · 77965c01
  df@kahlann.erinye.com authored Dec 07, 2006
  
  77965c01
- merging fix · 4f0c9c43
  holyfoot/hf@mysql.com/deer.(none) authored Dec 07, 2006
  
  4f0c9c43
- merging · 9203d434
  holyfoot/hf@mysql.com/deer.(none) authored Dec 07, 2006
  
  9203d434
06 Dec, 2006 6 commits
- Only call mysql_server_end if mysql_server_init has been called. · 94eb027f
  msvensson@neptunus.(none) authored Dec 06, 2006
```
Remove DBUG_ENTER in my_end
```
  94eb027f
- Flush stderr after print of error message to get predictable output · eb1ba91d
  msvensson@neptunus.(none) authored Dec 06, 2006
  
  eb1ba91d
- Merge mysql.com:/home/hf/work/22372/my41-22372 · 9e52ef1f
  holyfoot/hf@mysql.com/deer.(none) authored Dec 06, 2006
```
into  mysql.com:/home/hf/work/22372/my50-22372
```
  9e52ef1f
- bug #22372 · f404488d
  holyfoot/hf@mysql.com/deer.(none) authored Dec 06, 2006
```
datafile added to be used in gis.test
```
  f404488d
- bug #22372 (LOAD DATA crashes the table with the geometry field) · e83c682f
  holyfoot/hf@mysql.com/deer.(none) authored Dec 06, 2006
```
The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()
```
  e83c682f
- Adjust replace to mask win paths · 8022e9fc
  msvensson@neptunus.(none) authored Dec 06, 2006
  
  8022e9fc
05 Dec, 2006 5 commits
- Merge bk-internal:/home/bk/mysql-5.0-maint · 7cb305ca
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  7cb305ca
- Merge bk-internal:/home/bk/mysql-4.1-maint · b9a4ae99
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  b9a4ae99
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 244ec63a
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  244ec63a
- Remove hack that removes vardir · be212d34
  msvensson@neptunus.(none) authored Dec 05, 2006
  
  be212d34
- Merge bk-internal:/home/bk/mysql-4.1-build · a5074597
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
```
  a5074597