Commits · 777debdc421b2105d8681554e04155da0b81d9d2 · nexedi / MariaDB

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 3 commits
- 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
- support /etc/mysql/my.cnf in mysqld_multi as well. · 373e280e
  mtaylor@qualinost.(none) authored Dec 15, 2006
  
  373e280e
15 Dec, 2006 23 commits
- Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint · 3a682ca7
  mtaylor@qualinost.(none) authored Dec 15, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
```
  3a682ca7
- 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
- Calculate offset for wait time passed to set_timespec · 30deafa9
  msvensson@neptunus.(none) authored Dec 15, 2006
```
Pass different msg if waiting on empty queue
```
  30deafa9
- Bug#24997 warnings test case failure · a246eb39
  msvensson@neptunus.(none) authored Dec 15, 2006
```
 - Move the specific test case to a separate file that is run only
   if we have a disabled handler.
```
  a246eb39
- 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
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · e25b1344
  msvensson@neptunus.(none) authored Dec 15, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  e25b1344
- Bug#19209 Test 'rpl_openssl' hangs on Windows · da5e006d
  msvensson@neptunus.(none) authored Dec 15, 2006
```
 - Remove check not to run on windows. 
```
  da5e006d
- Remove junk · 8187397f
  msvensson@neptunus.(none) authored Dec 15, 2006
  
  8187397f
- Merge bk-internal:/home/bk/mysql-5.1-maint · e5f395f9
  msvensson@neptunus.(none) authored Dec 15, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  e5f395f9
- Merge 192.168.0.10:mysql/mysql-5.1-maint/ · 468a954e
  msvensson@shellback. authored Dec 15, 2006
```
into  shellback.:C:/mysql/mysql-5.1-new-maint
```
  468a954e
- Fix VC++ warning about extra ; delimiter · 5a31bff7
  msvensson@shellback. authored Dec 15, 2006
  
  5a31bff7
- Add macro for retrieving sec part of "struct timespec" · fe341ad9
  msvensson@shellback. authored Dec 15, 2006
```
Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem
```
  fe341ad9
- 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
- Merge siva.hindu.god:/usr/home/tim/m/bk/50 · b2ec2103
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51
```
  b2ec2103
- Post-merge fix to symlink.result · 17fb4c5c
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
  
  17fb4c5c
- Merge shakedown.(none):/home/jpipes/dev/bug21970/my50-bug21970 · eb4878d9
  jpipes@shakedown.(none) authored Dec 14, 2006
```
into  shakedown.(none):/home/jpipes/dev/bug21970/my51-bug21970
```
  eb4878d9
- Merge siva.hindu.god:/usr/home/tim/m/bk/50 · 9788de03
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51
```
  9788de03
14 Dec, 2006 13 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
- Fix for Bug#21970. · 3044ede1
  jpipes@shakedown.(none) authored Dec 14, 2006
```
Added a space between $MASTER_MYPORT and "+ 1" to ensure that the script correctly output 9307 instead of the string "9306+1"
```
  3044ede1
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · d399c344
  msvensson@neptunus.(none) authored Dec 15, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  d399c344
- Merge bk-internal:/home/bk/mysql-5.1-maint · d697f891
  msvensson@neptunus.(none) authored Dec 15, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
```
  d697f891
- Add support for loading example plugin and add plugin.test · 82db3278
  msvensson@neptunus.(none) authored Dec 15, 2006
  
  82db3278
- include/my_pthread.h: Fix botched merge - add struct timespec and set_timespec(), etc. · 1feb1887
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
  
  1feb1887
- 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 · e30dfac9
  mtaylor@qualinost.(none) authored Dec 14, 2006
```
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
```
  e30dfac9
- 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/50 · 6b5bd643
  tsmith/tim@siva.hindu.god authored Dec 14, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51
```
  6b5bd643