Commits · 83a5e775f533dbe1c9fa629b7cd067a3c26984f8 · Kirill Smelkov / mariadb

27 Sep, 2006 8 commits
- Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import · 83a5e775
  msvensson@neptunus.(none) authored Sep 27, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  83a5e775
- Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · d1f7bc09
  msvensson@neptunus.(none) authored Sep 27, 2006
```
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
```
  d1f7bc09
- Fix compile failure on Sun C++ 5.7 in yaSSL code · ca0b8c55
  msvensson@neptunus.(none) authored Sep 27, 2006
```
 - Trying to use unctions declared as static being used from another file, change them to be inline
```
  ca0b8c55
- Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import · 9f7b589d
  msvensson@neptunus.(none) authored Sep 27, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  9f7b589d
- Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 980268df
  msvensson@neptunus.(none) authored Sep 27, 2006
```
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
```
  980268df
- Import yaSSL version 1.4.3 · e4676ef6
  msvensson@neptunus.(none) authored Sep 27, 2006
  
  e4676ef6
- Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · dc1ec664
  msvensson@neptunus.(none) authored Sep 27, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
```
  dc1ec664
- When valgrinding add /usr/lib/debug" to LD_LIBRARY_PATH if available · be9a5571
  msvensson@neptunus.(none) authored Sep 27, 2006
  
  be9a5571
26 Sep, 2006 10 commits
- Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 8b2c05de
  msvensson@neptunus.(none) authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
```
  8b2c05de
- Fir problem with winepath in mwenv · 43f67cc4
  msvensson@neptunus.(none) authored Sep 26, 2006
  
  43f67cc4
- Merge neptunus.(none):/home/msvensson/mysql/netware/my51-netware · cc4d1a4d
  msvensson@neptunus.(none) authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  cc4d1a4d
- Merge neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969 · 03ead53d
  msvensson@neptunus.(none) authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  03ead53d
- Merge neptunus.(none):/home/msvensson/mysql/netware/my50-netware · a29a5228
  msvensson@neptunus.(none) authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/netware/my51-netware
```
  a29a5228
- Hardcode the fact that we are using zlib 1.2.3(previously done via symlink zlib-1.1.4) · 6a6345ef
  msvensson@neptunus.(none) authored Sep 26, 2006
  
  6a6345ef
- 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
- Update patch that restores slave databases from snapshots before start for 5.1 · 422674c7
  msvensson@neptunus.(none) authored Sep 26, 2006
  
  422674c7
- Merge neptunus.(none):/home/msvensson/mysql/bug18969/my50-bug18969 · ea91c010
  msvensson@neptunus.(none) authored Sep 26, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug18969/my51-bug18969
```
  ea91c010
- Bug#18969 race condition involving slave and mysqltest. was rpl_insert_id test case fails · dc02f761
  msvensson@neptunus.(none) authored Sep 26, 2006
```
 - As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
 - Count max number of slaves used in testcases
 - Use copy_install_db to speed up "Installing db" phase
```
  dc02f761
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 1 commit
- 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