mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
46613 commits 2788 branches 343 tags 1.7 GiB
Commit graph

46613 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.(none)
dec1657ac2 Merge pilot.(none):/data/msvensson/mysql/bug27597/my51-bug27597 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-05-29 12:54:02 +02:00
msvensson@pilot.(none)
5ceeb93291 Merge pilot.(none):/data/msvensson/mysql/bug27597/my50-bug27597 
into  pilot.(none):/data/msvensson/mysql/bug27597/my51-bug27597
 2007-05-29 12:53:03 +02:00
kaa@polly.local
8a9fd5995e Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-05-28 21:46:03 +04:00
kaa@polly.local
0dc78d3913 Don't use log_01[] in my_strtod() to avoid loss of precision. 
This is for bug #28121.
 2007-05-28 21:43:31 +04:00
kaa@polly.local
da4dd3c353 Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-05-28 15:36:19 +04:00
kaa@polly.local
afc59d3381 Some Windows-related fixes to make Microsoft compilers happy. This is for bug #28128. 2007-05-28 15:33:22 +04:00
kaa@polly.local
84c81bd534 Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-05-28 14:34:36 +04:00
kaa@polly.local
57917510e5 Merge polly.local:/home/kaa/src/maint/bug28121/my51-bug28121 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-05-28 14:30:28 +04:00
kaa@polly.local
c53168b9bd Changed the warning messages in the testcase to match 5.1 text. 
This is for bug #28121.
 2007-05-28 14:22:21 +04:00
kaa@polly.local
d6e66b6434 Merge polly.local:/home/kaa/src/maint/bug28121/my50-bug28121 
into  polly.local:/home/kaa/src/maint/bug28121/my51-bug28121
 2007-05-28 12:52:05 +04:00
kaa@polly.local
8ac1ffdf1d Fix for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits" 
When storing a large number to a FLOAT or DOUBLE field with fixed length, it could be incorrectly truncated if the field's length was greater than 31.

This patch also does some code cleanups to be able to reuse code which is common between Field_float::store() and Field_double::store().
 2007-05-28 12:44:59 +04:00
msvensson@pilot.blaudden
4ac551f499 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-25 16:48:23 +02:00
msvensson@pilot.blaudden
e50116e99e Bug#26664 test suite times out on OS X 64bit 
- Add checks to make sure net has a vio assigned
 - For example bootstrap will create a fake "net" with vio
   set to 0
 2007-05-25 16:47:43 +02:00
msvensson@pilot.blaudden
792f6e349d Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-25 16:43:51 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
61dd2f61be Test for bug #26842 moved to a separate file as it uses 'show binlog events' and fails with --binlog-format=row. 2007-05-25 17:24:45 +05:00
msvensson@pilot.blaudden
8eae98225c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-25 11:41:10 +02:00
msvensson@pilot.blaudden
006afd713d Bug #26664 test suite times out on OS X 64bit 
- Make the two "my_net_set*" function only visible when included
   from my_global.h
 2007-05-25 11:38:23 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
b49abf428c Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b26842/b26842.5.0
 2007-05-25 11:13:32 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a311b3fefd Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b26842/b26842.5.1
 2007-05-25 11:11:15 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
1af7eea565 after-merge fix 2007-05-25 10:13:27 +05:00
msvensson@pilot.blaudden
3545f28c91 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-24 22:26:49 +02:00
msvensson@pilot.blaudden
9d225361cd Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-24 20:59:02 +02:00
msvensson@pilot.blaudden
b69026d273 Rename two occurences of net_set_*_timeout that has changed file 
between 5.0 and 5.1 and thus missed the merge
 2007-05-24 20:57:10 +02:00
msvensson@pilot.blaudden
cd57ecbd5d Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-24 20:53:22 +02:00
msvensson@pilot.blaudden
374de2c7cb Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-24 20:51:37 +02:00
msvensson@pilot.blaudden
5d22eb6552 Merge pilot.blaudden:/home/msvensson/mysql/bug26664/my50-bug26664 
into  pilot.blaudden:/home/msvensson/mysql/bug26664/my51-bug26664
 2007-05-24 20:43:12 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
6369ff54b7 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28464.new/b28464.new.5.0
 2007-05-24 20:21:04 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
e2d216450a Merge mysql.com:/home/ram/work/b28464.new/b28464.new.5.0 
into  mysql.com:/home/ram/work/b28464.new/b28464.new.5.1
 2007-05-24 18:42:38 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
0bdeffd875 Merge mysql.com:/home/ram/work/b26842/b26842.5.0 
into  mysql.com:/home/ram/work/b26842/b26842.5.1
 2007-05-24 15:42:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2c759bd45f Fix for 
bug #26842: master binary log contains invalid queries - replication fails
bug #12826: Possible to get inconsistent slave using SQL syntax Prepared Statements

Problem:  
binlogging PS' we may produce syntacticly incorrect queries in the binlog replacing 
some parameters with variable names (instead of variable values).
E.g. in the reported case of "limit ?" clause: replacing "?" with "@var"
produces "limit @var" which is not a correct SQL syntax. 
Also it may lead to different query execution on slave if we
set and use a variable in the same statement, e.g.
"insert into t1 values (@x:=@x+1, ?)"

Fix: make the stored statement string created upon its execution use variable values
(instead of names) to fill placeholders.
 2007-05-24 15:35:43 +05:00
msvensson@pilot.blaudden
7327f42060 Merge pilot.blaudden:/home/msvensson/mysql/bug28521/my51-bug28521 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-24 12:31:48 +02:00
msvensson@pilot.blaudden
cca2c53113 Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-05-24 12:05:04 +02:00
msvensson@pilot.blaudden
a99fe7f3d6 Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-24 12:04:03 +02:00
msvensson@pilot.blaudden
4698a61ec4 Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438 
into  pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438
 2007-05-24 12:03:55 +02:00
msvensson@pilot.blaudden
93b1fe65d8 Bug#26664 test suite times out on OS X 64bit 
- The "mysql client in mysqld"(which is used by
   replication and federated) should use alarms instead of setting
   socket timeout value if the rest of the server uses alarm. By
   always calling 'my_net_set_write_timeout'
   or 'my_net_set_read_timeout' when changing the timeout value(s), the
   selection whether to use alarms or timeouts will be handled by
   ifdef's in those two functions. 
 - Move declaration of 'vio_timeout' into "vio_priv.h"
 2007-05-24 11:21:27 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
6224867b16 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28509/b28509.5.0
 2007-05-23 16:31:22 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d221363c29 after-merge fix: adjusted test results. 2007-05-23 15:49:17 +05:00
msvensson@shellback.(none)
61ed6da11f Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-05-23 12:20:11 +02:00
msvensson@shellback.(none)
b34660a877 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-05-23 12:15:25 +02:00
msvensson@shellback.(none)
933afe6cb4 Bug#27396 Wrong check for root priveledge 
- Check that filemode was set to 0000
 2007-05-23 12:13:49 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
1f9b403b45 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28509/b28509.5.0
 2007-05-23 13:48:31 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3d940b1478 Merge mysql.com:/home/ram/work/b28509/b28509.5.0 
into  mysql.com:/home/ram/work/b28509/b28509.5.1
 2007-05-23 13:47:34 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
7ed9851230 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b23810/b23810.5.1
 2007-05-23 13:16:07 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
794100ce7e Fix for bug #23810: Server crashes on various "show status ..." commands 
We access some variable values using casts like *(long *) buff
that may cause crashes on some platforms (e.g. solaris 64) if buff is
not properly aligned.
Fix: align the buffer used.
 2007-05-23 12:15:47 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
822b1d40b0 Merge mysql.com:/home/ram/work/b21476/b21476.5.0 
into  mysql.com:/home/ram/work/b21476/b21476.5.1
 2007-05-23 08:52:33 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f1ae9793a7 Fix for bug #21476: stack overflow crashes server; error-message stack reservation too small 
Increase STACK_BUFF_ALLOC to avoid execution_constants test failure on the hpita2.
 2007-05-22 11:16:29 +05:00
tsmith@quadxeon.mysql.com
6ddf4785bb Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-21 21:03:03 +02:00
tsmith@quadxeon.mysql.com
b3a84ddd89 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-21 20:55:10 +02:00
tsmith@quadxeon.mysql.com
f8ac268e58 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-21 20:53:15 +02:00
tsmith@quadxeon.mysql.com
672237f5b5 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-05-21 20:51:31 +02:00