mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41267 commits 2784 branches 343 tags 1.6 GiB
Commit graph

41267 commits

This branch
This branch
All branches
Author SHA1 Message Date
mtaylor@qualinost.(none)
3a682ca78d Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-15 13:23:57 -08:00
mtaylor@qualinost.(none)
2a13b547f2 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-15 13:20:41 -08:00
mtaylor@qualinost.(none)
265370f5c3 Added /etc/mysql to my.cnf search path after /etc. 
bug #25104
 2006-12-15 12:34:36 -08:00
mtaylor@qualinost.(none)
57baef9584 Added support for /etc/mysql after /etc in the search path for my.cnf 
bug #25104
 2006-12-15 12:25:09 -08:00
mtaylor@qualinost.(none)
b1e7c78302 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-15 11:45:26 -08:00
mtaylor@qualinost.(none)
e03a6b86d8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
 2006-12-15 11:38:41 -08:00
mtaylor@qualinost.(none)
3da37d3fa2 Added support for sensible-editor from Debian, instead of emacs. 2006-12-15 10:57:58 -08:00
msvensson@neptunus.(none)
30deafa958 Calculate offset for wait time passed to set_timespec 
Pass different msg if waiting on empty queue
 2006-12-15 17:47:20 +01:00
msvensson@neptunus.(none)
a246eb39bb Bug#24997 warnings test case failure 
- Move the specific test case to a separate file that is run only
   if we have a disabled handler.
 2006-12-15 15:05:50 +01:00
msvensson@neptunus.(none)
5c1612723d Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-15 13:30:20 +01:00
msvensson@neptunus.(none)
e25b1344cd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-15 13:24:30 +01:00
msvensson@neptunus.(none)
da5e006dda Bug#19209 Test 'rpl_openssl' hangs on Windows 
- Remove check not to run on windows.
 2006-12-15 13:23:45 +01:00
msvensson@neptunus.(none)
8187397f8e Remove junk 2006-12-15 12:54:40 +01:00
msvensson@neptunus.(none)
e5f395f96c Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-15 11:21:44 +01:00
msvensson@shellback.
468a954e4e Merge 192.168.0.10:mysql/mysql-5.1-maint/ 
into  shellback.:C:/mysql/mysql-5.1-new-maint
 2006-12-15 10:50:28 +01:00
msvensson@shellback.
5a31bff73d Fix VC++ warning about extra ; delimiter 2006-12-15 10:45:25 +01:00
msvensson@shellback.
fe341ad904 Add macro for retrieving sec part of "struct timespec" 
Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem
 2006-12-15 10:41:24 +01:00
thek@kpdesk.mysql.com
158ee61fe0 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2006-12-15 07:59:09 +01:00
thek@kpdesk.mysql.com
24dfe0b0b4 Bug#17498 failed to put data file in custom directory use "data directory" option 
- Result file was not properly committed.
- Update result file to match the new test case.
 2006-12-15 07:56:01 +01:00
tsmith/tim@siva.hindu.god
b2ec2103a3 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 17:48:44 -07:00
tsmith/tim@siva.hindu.god
17fb4c5cbd Post-merge fix to symlink.result 2006-12-14 17:47:55 -07:00
tsmith/tim@siva.hindu.god
9788de036b Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 17:03:44 -07:00
tsmith/tim@siva.hindu.god
9cbe0621b8 Merge siva.hindu.god:/usr/home/tim/m/bk/41 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-14 16:51:12 -07:00
tsmith/tim@siva.hindu.god
8e5be1ad97 myisam.result: a test was moved from the .test file, but the results were not updated. 2006-12-14 16:23:54 -07:00
msvensson@neptunus.(none)
d399c34412 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-15 00:15:52 +01:00
msvensson@neptunus.(none)
d697f8919a Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-15 00:14:49 +01:00
msvensson@neptunus.(none)
82db3278aa Add support for loading example plugin and add plugin.test 2006-12-15 00:09:56 +01:00
tsmith/tim@siva.hindu.god
1feb188721 include/my_pthread.h: Fix botched merge - add struct timespec and set_timespec(), etc. 2006-12-14 15:36:45 -07:00
msvensson@neptunus.(none)
45cd2db043 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-14 21:48:58 +01:00
msvensson@neptunus.(none)
110b8af303 Put the DBUG_DUMP inside ifdef DEBUG_DATA_PACKETS 2006-12-14 21:48:08 +01:00
mtaylor@qualinost.(none)
e30dfac98b Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
 2006-12-14 12:21:37 -08:00
mtaylor@qualinost.(none)
b8542e9cd7 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2006-12-14 12:20:31 -08:00
mtaylor@qualinost.(none)
54e7d71477 Change permissions on $mysql_unix_port_dir if we create it so that everyone can access it. 2006-12-14 12:18:36 -08:00
tsmith/tim@siva.hindu.god
6b5bd643a4 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 13:02:12 -07:00
tsmith/tim@siva.hindu.god
8fbfaeb51f Merge siva.hindu.god:/usr/home/tim/m/bk/41 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-14 13:01:08 -07:00
tsmith/tim@siva.hindu.god
126f004a7f Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-12-14 12:56:57 -07:00
msvensson@neptunus.(none)
e69df83d8d Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-14 19:32:17 +01:00
thek@kpdesk.mysql.com
165ae199ab Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2006-12-14 16:09:15 +01:00
thek@kpdesk.mysql.com
b19b9333f0 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2006-12-14 16:04:07 +01:00
Kristofer.Pettersson@naruto.
e09e2694d6 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  naruto.:C:/cpp/mysql-4.1-maint
 2006-12-14 16:02:43 +01:00
Kristofer.Pettersson@naruto.
aa2c208899 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-14 15:52:06 +01:00
msvensson@shellback.
74e3857b8d Merge nocona:/data0/msvensson/mysql-5.0-maint 
into  shellback.:C:/mysql/mysql-5.0-maint
 2006-12-14 15:40:25 +01:00
thek@kpdesk.mysql.com
1d14b89871 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2006-12-14 15:30:00 +01:00
msvensson@shellback.
c41e307d85 BUG#24687 func_misc test fails on win64 
- Use same precision (milliseconds) for all time functions
   used  when calculating time for pthread_cond_timedwait
 - Use 'GetSystemTimeAsFileTime' for both start and curr time
 2006-12-14 15:23:44 +01:00
thek@kpdesk.mysql.com
b7fcaadacf Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2006-12-14 14:50:08 +01:00
thek@kpdesk.mysql.com
f8ac527b73 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2006-12-14 14:48:19 +01:00
thek@kpdesk.mysql.com
070ff2ac72 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/bug17489/my51-bug17498
 2006-12-14 13:53:13 +01:00
thek@kpdesk.mysql.com
7e60087441 Bug#17498 failed to put data file in custom directory use "data directory" option 
Merged 4.1->5.0. Updated myisam.test
 2006-12-14 13:45:17 +01:00
thek@kpdesk.mysql.com
c9622dfb0a Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
 2006-12-14 13:38:09 +01:00
thek@kpdesk.mysql.com
29f72a0ba1 Bug#17498 failed to put data file in custom directory use "data directory" option 
- When this bug was corrected it changed the behavior 
  for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
  test file.
 2006-12-14 13:23:31 +01:00