Commits · 8da9222853dd40739f513bd6a3c93b9b818840c5 · Kirill Smelkov / mariadb

22 Dec, 2006 6 commits
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 8da92228
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  8da92228
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · b28e8faf
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  b28e8faf
- Set default number of masters to 1 · 73d82523
  msvensson@pilot.mysql.com authored Dec 22, 2006
  
  73d82523
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · c862eae1
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  c862eae1
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 0af85f85
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  0af85f85
- Merge neptunus:mysql/mysql-5.0-maint · a386c9d7
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  a386c9d7
21 Dec, 2006 4 commits
- Merge neptunus:mysql/mysql-4.1-maint · e1fcd181
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
  e1fcd181
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · acc5e0e3
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  acc5e0e3
- Bug #23125 [patch] trigger test fails when run as root · 2e744d56
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
 - Skip tests using chmod when running as root
```
  2e744d56
- Bug#24148 regression tests hang with SSL enabled · 945c35ee
  msvensson@pilot.mysql.com authored Dec 22, 2006
```
 - Don't call SSL_shutdown a second time
```
  945c35ee
20 Dec, 2006 4 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · fe0a11d1
  msvensson@neptunus.(none) authored Dec 20, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  fe0a11d1
- Count number of masters the test is actually using and only start as · da6773f9
  msvensson@neptunus.(none) authored Dec 20, 2006
```
many as neeeded
```
  da6773f9
- When running with --valgrind and --debug send all the output from · 5ccd3608
  msvensson@neptunus.(none) authored Dec 20, 2006
```
mysqld and valgrind to tracefile.
```
  5ccd3608
- Add possibility to activate --mark-progress of mysqltest · be0368c2
  msvensson@neptunus.(none) authored Dec 20, 2006
  
  be0368c2
19 Dec, 2006 11 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · ad0d8025
  mtaylor@qualinost.(none) authored Dec 19, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
  ad0d8025
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 66d984cf
  mtaylor@qualinost.(none) authored Dec 19, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
```
  66d984cf
- Merge polly.local:/tmp/maint/bug24117/my51-bug24117 · d3f5fff4
  kaa@polly.local authored Dec 19, 2006
```
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
```
  d3f5fff4
- Merge polly.local:/tmp/maint/bug24117/my50-bug24117 · c637ffec
  kaa@polly.local authored Dec 19, 2006
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
```
  c637ffec
- Added copy_typelib() declaration to make ABI compatibility test happy · 221be008
  kaa@polly.local authored Dec 19, 2006
  
  221be008
- Merge polly.local:/tmp/maint/bug24117/my50-bug24117 · 84f6f1be
  kaa@polly.local authored Dec 19, 2006
```
into  polly.local:/tmp/maint/bug24117/my51-bug24117
```
  84f6f1be
- Added copy_typelib() declaration to make ABI compatibility test happy · 6a304f3f
  kaa@polly.local authored Dec 19, 2006
  
  6a304f3f
- Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint · 92b5b1ef
  mtaylor@qualinost.(none) authored Dec 18, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
```
  92b5b1ef
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c58e3bc6
  mtaylor@qualinost.(none) authored Dec 18, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
```
  c58e3bc6
- Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint · bcebea96
  mtaylor@qualinost.(none) authored Dec 18, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
  bcebea96
- Search through options to find where the slow query log actually is. · 09591de3
  mtaylor@qualinost.(none) authored Dec 18, 2006
  
  09591de3
18 Dec, 2006 10 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · d7777d14
  kaa@polly.local authored Dec 18, 2006
```
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
```
  d7777d14
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c4dd2677
  kaa@polly.local authored Dec 18, 2006
```
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
```
  c4dd2677
- Merge fix of updated test result · b1eeb52c
  msvensson@maint1.mysql.com authored Dec 18, 2006
  
  b1eeb52c
- Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint · 8c3dab2f
  msvensson@maint1.mysql.com authored Dec 18, 2006
```
into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint
```
  8c3dab2f
- Update function description for Event_queue::get_top_for_execution_if_time · fc45754f
  msvensson@shellback. authored Dec 18, 2006
  
  fc45754f
- Merge maint1:/data/localhome/msvensson/mysql-5.1-new-maint · a811fd23
  msvensson@shellback. authored Dec 18, 2006
```
into  shellback.:C:/mysql/mysql-5.1-new-maint
```
  a811fd23
- Reorganize the wait for event to be scheduled loop · 395a0167
  msvensson@shellback. authored Dec 18, 2006
```
Only use "set_timespec" when there is a need to use it
```
  395a0167
- Merge maint1:/data/localhome/msvensson/mysql-5.0-maint · e5710dee
  msvensson@shellback. authored Dec 18, 2006
```
into  shellback.:C:/mysql/mysql-5.0-maint
```
  e5710dee
- Change windows pthread_cond_timedwait to use an absolute time value · c3fb91b7
  msvensson@shellback. authored Dec 18, 2006
  
  c3fb91b7
- Use MYSQLTEST_VARDIR variable · 6cd4a816
  msvensson@maint1.mysql.com authored Dec 18, 2006
  
  6cd4a816
17 Dec, 2006 1 commit
- Merge shakedown.(none):/home/jpipes/dev/mysql-5.1-maint · 777debdc
  jpipes@shakedown.(none) authored Dec 16, 2006
```
into  shakedown.(none):/home/jpipes/dev/bug21970/my51-bug21970
```
  777debdc
16 Dec, 2006 4 commits
- Changed config of mysqlmanager to use my.cnf search path. · d194a83b
  mtaylor@qualinost.(none) authored Dec 15, 2006
  
  d194a83b
- Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint · ca0f2e85
  mtaylor@qualinost.(none) authored Dec 15, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
```
  ca0f2e85
- Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint · 7f3d0c92
  mtaylor@qualinost.(none) authored Dec 15, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
  7f3d0c92
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · f4d09fa4
  kaa@polly.local authored Dec 16, 2006
```
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
```
  f4d09fa4