mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41253 commits 2785 branches 343 tags 1.6 GiB
Commit graph

41253 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
jpipes@shakedown.(none)
5b34e7566f Merge shakedown.(none):/home/jpipes/dev/bug20246/my51-bug20246 
into  shakedown.(none):/home/jpipes/dev/mysql-5.1-maint
 2006-12-13 19:09:17 -05:00
jpipes@shakedown.(none)
6eb6304e54 Merge jpipes@bk-internal:/home/bk/mysql-5.1-maint 
into  shakedown.(none):/home/jpipes/dev/mysql-5.1-maint
 2006-12-13 18:29:02 -05:00
msvensson@neptunus.(none)
9eb8a3fbee change all auto_ptr in yaSSL to mySTL since some lack reset 2006-12-13 23:30:20 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
46e07cc9d2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22377/my41-bug22377
 2006-12-13 14:05:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5e8e4745d8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22377/my50-bug22377
 2006-12-13 13:19:19 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b008f24ece Merge mysql.com:/usr/home/ram/work/bug22377/my41-bug22377 
into  mysql.com:/usr/home/ram/work/bug22377/my50-bug22377
 2006-12-13 13:02:11 +04:00
msvensson@neptunus.(none)
a31827f923 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-11 17:05:04 +01:00
msvensson@neptunus.(none)
b880d8aa05 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-11 17:04:14 +01:00
msvensson@neptunus.(none)
4f042fe207 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-11 17:03:01 +01:00
msvensson@neptunus.(none)
eb1c280142 Wait for INSERT DELAYED to finish i.e sleep in while loop until 
"select count" is one more.
 2006-12-11 16:43:21 +01:00
msvensson@neptunus.(none)
8a7ea3c744 Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite 
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
  mysqltest
 2006-12-11 15:39:15 +01:00
Kristofer.Pettersson@naruto.
b7b1aab081 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-11 14:22:56 +01:00
Kristofer.Pettersson@naruto.
7651675dcd Merge kpettersson@bk-internal:/home/bk/mysql-5.1-new-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-12-11 13:33:23 +01:00
Kristofer.Pettersson@naruto.
74108797b7 Merge naruto.:C:/cpp/bug17489/my51-bug17489 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-12-11 13:22:47 +01:00