ramil/ram@myoffice.izhnet.ru
9e36baa952
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
2007-02-05 10:17:51 +04:00
ramil/ram@myoffice.izhnet.ru
0974b9fa11
Merge mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
...
into mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
2007-02-05 09:56:30 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b0977714a8
Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
...
into mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
2007-02-05 09:54:23 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
9d46fd5cc4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b26012/b26012.5.1
2007-02-01 19:53:26 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
6136556fba
Merge mysql.com:/home/ram/work/b26012/b26012.5.0
...
into mysql.com:/home/ram/work/b26012/b26012.5.1
2007-02-01 19:52:33 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7bcf2bf338
Merge mysql.com:/home/ram/work/b26012/b26012.4.1
...
into mysql.com:/home/ram/work/b26012/b26012.5.0
2007-02-01 19:51:45 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d710853fb8
Fix for bug #26012 : missed Field_double::size_of()
...
As we have Field_double::not_fixed we must have Field_double::size_of().
2007-02-01 19:51:02 +04:00
cmiller@zippy.cornsilk.net
9e4c483cc0
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-02-01 09:21:09 -05:00
brian@zim.(none)
acd1201504
Reworked a section of code that caused valgrind errors (and that partitioning was not happy about).
2007-01-31 20:13:17 -08:00
cmiller@zippy.cornsilk.net
522d6fb0cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:24:28 -05:00
cmiller@zippy.cornsilk.net
b81f4a8314
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:14:42 -05:00
cmiller@zippy.cornsilk.net
a3a9d8bd84
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
2007-01-31 16:09:36 -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)
13b35c4323
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-31 15:39:03 -05:00
ramil/ram@ramil.myoffice.izhnet.ru
ee56d2be9f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b19690/b19690.5.1
2007-01-31 14:28:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30f904eb2d
Merge mysql.com:/home/ram/work/b19690/b19690.5.0
...
into mysql.com:/home/ram/work/b19690/b19690.5.1
2007-01-31 12:53:36 +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
peterg/pgulutzan@linux.site
2b432c7a23
Changed comments before functions to Doxygen style.
2007-01-30 16:15:22 -07:00
brian@zim.(none)
8ac1d06728
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-29 13:19:51 -08:00
brian@zim.(none)
9fc89facca
Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached.
2007-01-29 13:17:30 -08:00
msvensson@pilot.mysql.com
72689aad2b
Merge 192.168.0.10:mysql/mysql-5.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-29 19:46:00 +01:00
msvensson@neptunus.(none)
adf20e3512
Bug#22579 use --warning-mode=pedantic and -std=c89 flags when compiling with gcc
...
- Reorganize include file order to avoid problem with gcc 2.95.3
- Compiler is confused by forward class declarations
2007-01-29 19:36:48 +01:00
msvensson@pilot.mysql.com
ac10ad6bdb
Merge 192.168.0.10:mysql/yassl_import/my51-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/work/my51-work
2007-01-29 19:15:25 +01:00
msvensson@neptunus.(none)
d52aee0c43
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2007-01-29 19:11:59 +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
544c19b3e6
Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work
...
into pilot.mysql.com:/home/msvensson/mysql/work/my51-work
2007-01-29 18:48:20 +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
a7659cf5c7
Merge 192.168.0.10:mysql/yassl_import/my51-yassl_import
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-29 18:40:22 +01:00
msvensson@neptunus.(none)
03b346fce3
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2007-01-29 18:33:23 +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)
c4db290104
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-29 12:30:48 -05:00
msvensson@neptunus.(none)
7a8334edfb
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2007-01-29 17:54:41 +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
388e846499
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-29 16:11:31 +01:00
msvensson@pilot.mysql.com
719a8f5896
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
2007-01-29 14:35:09 +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
3bc4d45e29
Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474
...
into pilot.mysql.com:/home/msvensson/mysql/bug19474/my51-bug19474
2007-01-29 12:24:49 +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
baker@bk-internal.mysql.com
bf7efc3ce3
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-28 00:48:11 +01:00
baker@bk-internal.mysql.com
b64060f70d
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-27 00:36:40 +01:00
brian@zim.(none)
08e93132c4
Two things:
...
1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world.
2007-01-26 15:36:39 -08:00
brian@zim.(none)
8820333ec3
For performance reasons we remove the ability in unique indexes on autoincrements to remove the ability to insert key lower then the current autoincrement value.
2007-01-26 14:17:45 -08:00
mtaylor@qualinost.(none)
b7a7d3f7c6
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-26 13:11:10 -08:00
brian@zim.(none)
24d9d866c2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-26 12:49:20 -08: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