Commits · e0f9996e3d6db1725e7881933d06284616720590 · nexedi / MariaDB

14 Dec, 2006 1 commit
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · e0f9996e
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  e0f9996e
12 Dec, 2006 5 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6a49f0cd
  gluh@gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  6a49f0cd
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · c6d9cf1b
  gluh@gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  c6d9cf1b
- 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
- BUG#24902 · 682f8fe2
  df@kahlann.erinye.com authored Dec 12, 2006
  
  682f8fe2
11 Dec, 2006 2 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-5.1 · 024597b3
  df@kahlann.erinye.com authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  024597b3
07 Dec, 2006 13 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 8fffa20a
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  8fffa20a
- 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-5.0-build-work · 01395b1d
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  01395b1d
- 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
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c24381bd
  andrey@example.com authored Dec 07, 2006
```
into  example.com:/work/mysql-5.1-maint
```
  c24381bd
- Additional fix for bug#22369 · 12a68db3
  andrey@example.com authored Dec 07, 2006
  
  12a68db3
- Merge mysql.com:/home/hf/work/pfix/my50-pfix · 883aa8d9
  holyfoot/hf@deer.(none) authored Dec 07, 2006
```
into  mysql.com:/home/hf/work/pfix/my51-pfix
```
  883aa8d9
- merging fix · 4f0c9c43
  holyfoot/hf@mysql.com/deer.(none) authored Dec 07, 2006
  
  4f0c9c43
- merging · 41bd03c3
  holyfoot/hf@mysql.com/deer.(none) authored Dec 07, 2006
  
  41bd03c3
- Merge mysql.com:/home/hf/work/22372/my50-22372 · dfff2c27
  holyfoot/hf@deer.(none) authored Dec 07, 2006
```
into  mysql.com:/home/hf/work/22372/my51-22372
```
  dfff2c27
- merging · 9203d434
  holyfoot/hf@mysql.com/deer.(none) authored Dec 07, 2006
  
  9203d434
06 Dec, 2006 10 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 961275a3
  msvensson@neptunus.(none) authored Dec 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  961275a3
- 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
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 9079dd2a
  holyfoot/hf@deer.(none) authored Dec 06, 2006
```
into  mysql.com:/home/hf/work/mysql-5.1.20835
```
  9079dd2a
- Initialize guarded_instance to NULL in constuctor. Avoid looping over · d1c9edf4
  msvensson@neptunus.(none) authored Dec 06, 2006
```
uninitialized list of guarded instances.
```
  d1c9edf4
- Merge bk@192.168.21.1:mysql-5.1-opt · 4e353062
  holyfoot/hf@deer.(none) authored Dec 06, 2006
```
into  mysql.com:/home/hf/work/mysql-5.1.20835
```
  4e353062
05 Dec, 2006 9 commits
- Merge bk-internal:/home/bk/mysql-5.1-maint · ccec047f
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  ccec047f
- 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-5.0-maint · 90226bbc
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  90226bbc
- 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
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 3ad48783
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  3ad48783
- Merge bk-internal:/home/bk/mysql-5.1 · d8e6f013
  msvensson@neptunus.(none) authored Dec 05, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  d8e6f013