mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34669 commits 2789 branches 343 tags 1.7 GiB
Commit graph

34669 commits

This branch
This branch
All branches
Author SHA1 Message Date
cmiller@zippy.cornsilk.net
ad66e7a0dd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:23:05 -05:00
cmiller@zippy.cornsilk.net
5a0ac8afe7 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-31 16:14:12 -05:00
cmiller@zippy.cornsilk.net
24e3508b0e Bug#25341: "init.d/mysql stop" may timeout too quickly 
Thirty five seconds is entirely too short of a period to wait for a server 
to exit.  Instead, make a valliant effort to make sure it exits, and only
give up after a very long period (arbitrarily chosen as 15 minutes).

In addition, if we're being asked to restart the server, then don't try
to start again if trying to stop the server failed.
---
Return zero by default, when the script exits.
---
Set return-/exit-value based on whether we successfully dealt with the 
PID-file.
---
Don't wait that long if the program we're waiting on exits.  It 
should only exit if the server is not going to be started.
 2007-01-31 15:39:41 -05:00
mtaylor@qualinost.(none)
50796a040e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-01-31 15:37:12 -05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8da5745858 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b19690/b19690.5.0
 2007-01-31 14:31:11 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
0bd1c03e7e after-merge fix. 2007-01-31 11:14:32 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f0f83a36bc Merge mysql.com:/home/ram/work/b19690/b19690.4.1 
into  mysql.com:/home/ram/work/b19690/b19690.5.0
 2007-01-31 10:07:56 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
eb415e4920 fix for bug #19690: ORDER BY eliminates rows from the result 
Depending on the queries we use different data processing methods
and can lose some data in case of double (and decimal in 4.1) fields.

The fix consists of two parts:
1. double comparison changed, now double a is equal to double b 
if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)). 
For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005
2. if we use a temporary table, store double values there as is 
to avoid any data conversion (rounding).
 2007-01-31 09:51:05 +04:00
msvensson@pilot.mysql.com
f3add981bc Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-29 19:15:26 +01:00
msvensson@pilot.mysql.com
a6fb89a704 Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import 
into  pilot.mysql.com:/home/msvensson/mysql/work/my50-work
 2007-01-29 19:12:22 +01:00
msvensson@neptunus.(none)
d1a7949297 Add result file for ssl_connect.test 2007-01-29 19:09:30 +01:00
msvensson@pilot.mysql.com
8bc890c146 Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-29 18:52:05 +01:00
msvensson@pilot.mysql.com
26e4f2e506 Bug#25417 "/usr/bin/test" installed from yassl/taocrypt/test 
- It's good to build the test programs for yaSSL to check for undefined
   symbols etc but they should not be installed by "make install"
 2007-01-29 18:46:06 +01:00
msvensson@pilot.mysql.com
d87ccc0c83 Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-29 18:38:12 +01:00
msvensson@neptunus.(none)
8c142aef3f Add test for making sure there are no spurious connect failures when using SSL 2007-01-29 18:32:45 +01:00
mtaylor@qualinost.(none)
d394d66d28 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-01-29 12:28:25 -05:00
msvensson@pilot.mysql.com
f73164bdfc Merge 192.168.0.10:mysql/yassl_import/my50-yassl_import 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-29 17:55:38 +01:00
msvensson@neptunus.(none)
751d00c47e Import latest version of yaSSL 
- Replace SawTooth copyright header with MySQL's
 - Bug#19209 Test 'rpl_openssl' hangs on Windows
 - Spurious "2013 Connection to server lost" errors fixed
   yaSSL doesn't close socket anymore, that is left to the application
 2007-01-29 16:54:40 +01:00
msvensson@pilot.mysql.com
07df8fd469 Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-29 16:12:12 +01:00
msvensson@pilot.mysql.com
007d170ad2 Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943 
into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
 2007-01-29 14:33:53 +01:00
msvensson@pilot.mysql.com
7eaa82ea38 Bug#22943 syscall pruning in libmysql 
- Set the timeout values only where needed
 2007-01-29 14:31:48 +01:00
msvensson@pilot.mysql.com
84947802c1 Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-01-29 12:27:11 +01:00
msvensson@pilot.mysql.com
d42b919a0b Bug#19474 readline bug: mysql: free(): invalid pointer 
- Write to uninitialised memory occured since _rl_rapped_lines buffer
   was not extended in CHECK_INV_LBREAKS macro
 - Patch submitted to bug-readline@gnu.org
 2007-01-29 12:24:08 +01:00
mtaylor@qualinost.(none)
f8f11eb2d9 Reverting change adding /etc/mysql support, as it breaks some installs. 2007-01-26 12:17:50 -08:00
mtaylor@qualinost.(none)
065ab1537a Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-01-26 12:13:59 -08:00
mtaylor@qualinost.(none)
58ae89cb76 User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0. 2007-01-26 12:00:38 -08:00
cmiller@zippy.cornsilk.net
f74992258a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-26 14:47:35 -05:00
cmiller@zippy.cornsilk.net
41179e6a8f Bug #25879: THD::options isn't set with ulonglong values and \ 
variables

Bits higher than 2**31 were impossible to set on THD::options.  It's
probably a remnant from a time when options was a 32-bit integer.

Now, use unsigned long-long constants and variables to set and clear
THD::options.
---
Pulled comments back to column 49.
 2007-01-26 14:47:12 -05:00
gluh@mysql.com/eagle.(none)
45f61a06fb Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2007-01-26 16:36:50 +04:00
kaa@polly.local
603475cbf9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-01-25 15:47:19 +03:00
dlenev@mockturtle.local
8b69d169d4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
 2007-01-25 11:26:18 +03:00
sergefp@mysql.com
4908cf0772 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
 2007-01-25 02:28:53 +03:00
sergefp@mysql.com
39e6de4359 BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...): 
Fixed typo problem that surfaced after the merge
 2007-01-25 02:27:28 +03:00
svoj@mysql.com/april.(none)
de1572d687 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-01-25 01:31:58 +04:00
svoj@mysql.com/april.(none)
ea7fe60fbc Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-01-25 01:26:57 +04:00
sergefp@mysql.com
cced625508 BUG#24127: merge fixes: If subselect is a union, dont allocate several 
identical pushed_cond_guards arrays. Allocate only one always.
 2007-01-24 22:23:50 +03:00
dlenev@mockturtle.local
37110aad7f Disabling back im_daemon_life_cycle.test, which was temporarily enabled in 
the team tree for additional investigation.
 2007-01-24 22:11:27 +03:00
dlenev@mockturtle.local
c762789096 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
 2007-01-24 19:33:06 +03:00
sergefp@mysql.com
e2f0f4dbd3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
 2007-01-24 19:13:28 +03:00
gluh@mysql.com/eagle.(none)
a7acea61de Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-01-24 19:24:16 +04:00
istruewing@chilla.local
0dc064536f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-24 15:52:19 +01:00
kaa@polly.local
c5a1c578f5 Merge polly.local:/tmp/maint/bug6774/my50-bug6774 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-01-24 17:30:01 +03:00
iggy@recycle.(none)
54ce485557 Merge recycle.(none):/src/bug24496/my50-bug24496 
into  recycle.(none):/src/mysql-5.0-maint
 2007-01-24 09:29:50 -05:00
kaa@polly.local
645de0c5d7 Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES" 2007-01-24 16:45:30 +03:00
istruewing@chilla.local
23debf8662 Bug#24607 - MyISAM pointer size determined incorrectly 
After merge fix
 2007-01-24 13:29:46 +01:00
istruewing@chilla.local
050ddb2032 Merge chilla.local:/home/mydev/mysql-4.1-bug24607 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-24 13:26:06 +01:00
istruewing@chilla.local
928d672c46 Bug#24607 - MyISAM pointer size determined incorrectly 
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
 2007-01-24 13:17:01 +01:00
df@kahlann.erinye.com
cb6c5f7ee7 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-24 09:24:52 +01:00
svoj@mysql.com/june.mysql.com
0e5aa80e8a After merge fix. 2007-01-24 11:53:09 +04:00
svoj@mysql.com/june.mysql.com
603dcb4d3f Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
 2007-01-24 11:41:13 +04:00