Commits · 285c14d3e74a94b1b5fd7c094834885a77d2f079 · Kirill Smelkov / mariadb

17 Oct, 2006 1 commit
- Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51 · 285c14d3
  tsmith/tim@siva.hindu.god authored Oct 16, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
```
  285c14d3
13 Oct, 2006 5 commits
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 0d9046ca
  ramil/ram@myoffice.izhnet.ru authored Oct 13, 2006
```
into  mysql.com:/usr/home/ram/work/bug23254/my51-bug23254
```
  0d9046ca
- Merge mysql.com:/usr/home/ram/work/bug23254/my50-bug23254 · bbd3470e
  ramil/ram@myoffice.izhnet.ru authored Oct 13, 2006
```
into  mysql.com:/usr/home/ram/work/bug23254/my51-bug23254
```
  bbd3470e
- Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254 · 84048dc7
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Oct 13, 2006
```
into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
```
  84048dc7
- Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL · 31402835
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Oct 13, 2006
```
We don't set null_value to 0 in the Item_func_compress::val_str() for 
not-NULL results.
```
  31402835
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 9268074e
  cmiller@zippy.cornsilk.net authored Oct 13, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51-alter
```
  9268074e
12 Oct, 2006 32 commits
- Additional patch for 5.1 commit for Bug#14262. · 177f6c64
  cmiller@zippy.cornsilk.net authored Oct 12, 2006
  
  177f6c64
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · ecb9b0cb
  kaa@polly.local authored Oct 12, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
  ecb9b0cb
- Merge polly.local:/tmp/maint/bug22728/my51-bug22728 · 0f23fb5d
  kaa@polly.local authored Oct 12, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
  0f23fb5d
- Merge polly.local:/tmp/maint/bug22728/my50-bug22728 · 9602f69b
  kaa@polly.local authored Oct 12, 2006
```
into  polly.local:/tmp/maint/bug22728/my51-bug22728
```
  9602f69b
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · de526225
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  de526225
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · fe7fce36
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  fe7fce36
- Add missing semicolon · 2db82814
  msvensson@shellback.(none) authored Oct 12, 2006
  
  2db82814
- Merge polly.local:/tmp/maint/bug22728/my41-bug22728 · 667f5b14
  kaa@polly.local authored Oct 12, 2006
```
into  polly.local:/tmp/maint/bug22728/my50-bug22728
```
  667f5b14
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 82a09970
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  82a09970
- Make all compile-netware-* scripts executable · 5abdd046
  msvensson@shellback.(none) authored Oct 12, 2006
  
  5abdd046
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 57ad872b
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  57ad872b
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 92522062
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  92522062
- Move the reconnect variable to beginning of function · 6c31690b
  msvensson@shellback.(none) authored Oct 12, 2006
```
Fix warning about value from "*ptr++" not being used. Changed it to ptr++ 
```
  6c31690b
- Add win paths for mysql_client_test · 2c4456d3
  msvensson@shellback.(none) authored Oct 12, 2006
  
  2c4456d3
- 5.1 should use libc-2006 by default · 2c6985b3
  msvensson@shellback.(none) authored Oct 12, 2006
  
  2c6985b3
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · d739a91a
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  d739a91a
- Use libc-2003 if available else default to libc · 27737f0b
  msvensson@shellback.(none) authored Oct 12, 2006
  
  27737f0b
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · bcf1bc4c
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  bcf1bc4c
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 1d77363c
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  1d77363c
- Look for mysql_client_test in $path_client_bindir · d093b102
  msvensson@shellback.(none) authored Oct 12, 2006
  
  d093b102
- Only one switch for ssl(--with-ssl) in 5.1 · 9a65dbea
  msvensson@shellback.(none) authored Oct 12, 2006
  
  9a65dbea
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · db72ea90
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  db72ea90
- Switch to use yaSSL instead of OpenSSL on Netware · 42a227e9
  msvensson@shellback.(none) authored Oct 12, 2006
  
  42a227e9
- Merge bk-internal:/home/bk/mysql-5.1-maint · e42934f1
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  e42934f1
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 1c9b35cd
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  1c9b35cd
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 5741683d
  msvensson@shellback.(none) authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  5741683d
- Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist · 3c66250e
  msvensson@shellback.(none) authored Oct 12, 2006
  
  3c66250e
- Only print cur_file->filename if cur_file->file is set · 71cb0e8d
  msvensson@shellback.(none) authored Oct 12, 2006
```
MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that
```
  71cb0e8d
- Merge polly.local:/tmp/maint/bug11655/my51-bug11655 · a82e5d4a
  kaa@polly.local authored Oct 12, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
  a82e5d4a
- Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is called · d534a6b9
  msvensson@shellback.(none) authored Oct 12, 2006
```
Add DBUG_PRINT to show the value of mysql->reconnect
```
  d534a6b9
- Merge polly.local:/tmp/maint/bug11655/my50-bug11655 · 105434f8
  kaa@polly.local authored Oct 12, 2006
```
into  polly.local:/tmp/maint/bug11655/my51-bug11655
```
  105434f8
- 5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1 · e89fdaac
  kaa@polly.local authored Oct 12, 2006
  
  e89fdaac
11 Oct, 2006 2 commits
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262 · 1279acd9
  cmiller@zippy.cornsilk.net authored Oct 11, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51
```
  1279acd9
- Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 0eb2fff7
  msvensson@shellback.(none) authored Oct 11, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  0eb2fff7