Commits · 5481659f6e1ec40e40eddea4ca68a615f571b415 · Kirill Smelkov / mariadb

26 Sep, 2006 1 commit
- Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import · 5481659f
  msvensson@neptunus.(none) authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  5481659f
25 Sep, 2006 11 commits
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · 4ee6e94f
  msvensson@neptunus.(none) authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  4ee6e94f
- Return from function 'collect_one_test_case' as sson it's detected that testcase should be skipped · 0be1bf6e
  msvensson@neptunus.(none) authored Sep 25, 2006
  
  0be1bf6e
- Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 40a655b1
  msvensson@neptunus.(none) authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  40a655b1
- Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 53b3faf7
  msvensson@neptunus.(none) authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
```
  53b3faf7
- Bug#18888 Trying to overwrite sql/lex_hash.h during build · 5edd58b1
  msvensson@neptunus.(none) authored Sep 25, 2006
```
 -Backport fix for bug19738 to 4.1 
```
  5edd58b1
- Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · bcdecd96
  msvensson@neptunus.(none) authored Sep 25, 2006
```
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
```
  bcdecd96
- Import yaSSL version 1.4.0 · 64a64d0f
  msvensson@neptunus.(none) authored Sep 25, 2006
  
  64a64d0f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 1027446d
  kaa@polly.local authored Sep 25, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
  1027446d
- Merge polly.local:/tmp/22129/bug22129/my51-bug22129 · 059b026d
  kaa@polly.local authored Sep 25, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
  059b026d
- Merge polly.local:/tmp/22129/bug22129/my50-bug22129 · c7c9cdf2
  kaa@polly.local authored Sep 25, 2006
```
into  polly.local:/tmp/22129/bug22129/my51-bug22129
```
  c7c9cdf2
- Fixed broken 'strict' test which relied on incorrect behaviour of my_strtod() (fixed in bug #22129) · 781879ad
  kaa@polly.local authored Sep 25, 2006
  
  781879ad
23 Sep, 2006 10 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 161fea4a
  cmiller@zippy.cornsilk.net authored Sep 23, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  161fea4a
- Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1 · 60e178bb
  lars/lthalmann@dl145k.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1
```
  60e178bb
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · bab37416
  lars/lthalmann@dl145k.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  bab37416
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge · 7a761a25
  lars/lthalmann@mysql.com/dl145k.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  7a761a25
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 7ce96bb5
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  7ce96bb5
- Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 80dadacb
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
```
  80dadacb
- Disabling test case · bbbb3901
  lars/lthalmann@mysql.com/dl145k.mysql.com authored Sep 23, 2006
  
  bbbb3901
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · b8556c82
  lars/lthalmann@dl145h.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  b8556c82
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · bbf84d6b
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  bbf84d6b
- Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl · 7e45d803
  lars/lthalmann@mysql.com/dl145h.mysql.com authored Sep 23, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
```
  7e45d803
22 Sep, 2006 11 commits
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb · 5e60232d
  mskold/marty@linux.site authored Sep 22, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  5e60232d
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · b9847507
  kaa@polly.local authored Sep 22, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
  b9847507
- Merge polly.local:/tmp/22129/bug22129/my50-bug22129 · c06dd5cd
  kaa@polly.local authored Sep 22, 2006
```
into  polly.local:/tmp/22129/bug22129/my51-bug22129
```
  c06dd5cd
- Merge polly.local:/tmp/22129/bug22129/my41-bug22129 · 6fd25f61
  kaa@polly.local authored Sep 22, 2006
```
into  polly.local:/tmp/22129/bug22129/my50-bug22129
```
  6fd25f61
- Merge trift2.:/MySQL/M50/mysql-5.0 · 4525ea4b
  joerg@trift2. authored Sep 22, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
  4525ea4b
- Fixed bug #22129: A small double precision number becomes zero · 1530b51d
  kaa@polly.local authored Sep 22, 2006
```
Better checks for underflow/overflow
```
  1530b51d
- Fix for bug #19121: Windows incompatible udf_example · 67a70100
  georg@lmy002.wdf.sap.corp authored Sep 22, 2006
  
  67a70100
- Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · 724ea113
  aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi authored Sep 22, 2006
```
into  dsl-hkigw8-feb9fb00-191.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
```
  724ea113
- BUG#22067 rpl_rbr_to_sbr and some other fail if NDB is default storage · 0c788a30
  aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi authored Sep 22, 2006
```
local file slipped into a previous commit, fixing ignore.
```
  0c788a30
- Fix windows and aix compile problem · 015d8409
  msvensson@neptunus.(none) authored Sep 22, 2006
```
 - Variables must be declared first in each block
```
  015d8409
- Added build rule for mysql_upgrade.exe · ca00ba49
  georg@lmy002.wdf.sap.corp authored Sep 22, 2006
  
  ca00ba49
21 Sep, 2006 7 commits
- Merge bk-internal.mysql.com:/tmp/knielsen/mysql-5.0-maint · ec2e007a
  knielsen@bk-internal.mysql.com authored Sep 21, 2006
```
into  bk-internal.mysql.com:/tmp/knielsen/mysql-5.1-new-maint
```
  ec2e007a
- After-merge fix (null merge). · 3491d37b
  knielsen@bk-internal.mysql.com authored Sep 21, 2006
  
  3491d37b
- Merge knielsen.mysql.internal:/usr/local/mysql/mysql-4.1 · 3c17386d
  knielsen@bk-internal.mysql.com authored Sep 21, 2006
```
into  bk-internal.mysql.com:/tmp/knielsen/mysql-5.0-maint
```
  3c17386d
- Fix Solaris 10 compile failure · 0dbbe513
  msvensson@shellback.(none) authored Sep 21, 2006
```
 - Void function can't return a value
```
  0dbbe513
- Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 · fe0cfacf
  msvensson@shellback.(none) authored Sep 21, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  fe0cfacf
- Merge bk-internal:/home/bk/mysql-5.1-maint · c898d8e1
  msvensson@shellback.(none) authored Sep 21, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  c898d8e1
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · 17218bd7
  joerg@trift2. authored Sep 21, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  17218bd7