Commits · b28e8faf234c3b82be1b390ee8e400e0259e1842 · Kirill Smelkov / mariadb

22 Dec, 2006 4 commits
- 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-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 3 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
- 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 5 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 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 · 6a304f3f
  kaa@polly.local authored Dec 19, 2006
  
  6a304f3f
- 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 4 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 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
16 Dec, 2006 2 commits
- 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
- support /etc/mysql/my.cnf in mysqld_multi as well. · 373e280e
  mtaylor@qualinost.(none) authored Dec 15, 2006
  
  373e280e
15 Dec, 2006 11 commits
- Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint · 2a13b547
  mtaylor@qualinost.(none) authored Dec 15, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
  2a13b547
- Added /etc/mysql to my.cnf search path after /etc. · 265370f5
  mtaylor@qualinost.(none) authored Dec 15, 2006
```
bug #25104
```
  265370f5
- Added support for /etc/mysql after /etc in the search path for my.cnf · 57baef95
  mtaylor@qualinost.(none) authored Dec 15, 2006
```
bug #25104
```
  57baef95
- Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint · b1e7c783
  mtaylor@qualinost.(none) authored Dec 15, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
  b1e7c783
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · e03a6b86
  mtaylor@qualinost.(none) authored Dec 15, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
```
  e03a6b86
- Added support for sensible-editor from Debian, instead of emacs. · 3da37d3f
  mtaylor@qualinost.(none) authored Dec 15, 2006
  
  3da37d3f
- Merge bk-internal:/home/bk/mysql-5.0-maint · 5c161272
  msvensson@neptunus.(none) authored Dec 15, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  5c161272
- Bug#19209 Test 'rpl_openssl' hangs on Windows · da5e006d
  msvensson@neptunus.(none) authored Dec 15, 2006
```
 - Remove check not to run on windows. 
```
  da5e006d
- Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint · 158ee61f
  thek@kpdesk.mysql.com authored Dec 15, 2006
```
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
```
  158ee61f
- Bug#17498 failed to put data file in custom directory use "data directory" option · 24dfe0b0
  thek@kpdesk.mysql.com authored Dec 15, 2006
```
- Result file was not properly committed.
- Update result file to match the new test case.
```
  24dfe0b0
- Post-merge fix to symlink.result · 17fb4c5c
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
  
  17fb4c5c
14 Dec, 2006 7 commits
- Merge siva.hindu.god:/usr/home/tim/m/bk/41 · 9cbe0621
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/50
```
  9cbe0621
- myisam.result: a test was moved from the .test file, but the results were not updated. · 8e5be1ad
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
  
  8e5be1ad
- Merge bk-internal:/home/bk/mysql-5.0-maint · 45cd2db0
  msvensson@neptunus.(none) authored Dec 14, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  45cd2db0
- Put the DBUG_DUMP inside ifdef DEBUG_DATA_PACKETS · 110b8af3
  msvensson@neptunus.(none) authored Dec 14, 2006
  
  110b8af3
- Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint · b8542e9c
  mtaylor@qualinost.(none) authored Dec 14, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
```
  b8542e9c
- Change permissions on $mysql_unix_port_dir if we create it so that everyone can access it. · 54e7d714
  mtaylor@qualinost.(none) authored Dec 14, 2006
  
  54e7d714
- Merge siva.hindu.god:/usr/home/tim/m/bk/41 · 8fbfaeb5
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/50
```
  8fbfaeb5