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

46764 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
jbruehe/mysqldev@mysql.com/production.mysql.com
7034295f79 Raise version number after cloning 5.1.19-beta 2007-05-24 17:35:22 +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
joerg@trift2.
db9128f84f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-05-24 15:32:14 +02:00
joerg@trift2.
8592dfd90d Makefile.am : Add "embedded" tests to the "test-bt" target. 2007-05-24 15:20:06 +02: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
df@pippilotta.erinye.com
a390ac46a9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-24 09:29:12 +02:00
df@pippilotta.erinye.com
2120cb89e0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-24 09:28:30 +02:00
df@pippilotta.erinye.com
d542298098 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-24 09:27:53 +02:00
df@pippilotta.erinye.com
7459b4fca5 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-24 09:26:05 +02:00
df@pippilotta.erinye.com
d29eaed81a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-24 09:22:00 +02:00
df@pippilotta.erinye.com
918d90d516 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-05-24 09:12:29 +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
joerg@trift2.
fb47cb1c82 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-05-23 12:02:48 +02:00
df@pippilotta.erinye.com
77e1e678d3 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-05-23 10:51:27 +02:00
df@pippilotta.erinye.com
a70903b7f8 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-05-23 10:49:26 +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
svoj@june.mysql.com
64d34f6e22 Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-05-23 12:42:17 +05:00
svoj@june.mysql.com
442969fd16 Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-05-23 12:41:30 +05:00
svoj@june.mysql.com
43b2dc188f Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-05-23 12:40:12 +05:00
svoj@mysql.com/june.mysql.com
122167bb4b Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
 2007-05-23 12:39:33 +05:00
svoj@mysql.com/june.mysql.com
a4ddc22621 Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2007-05-23 12:38:34 +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
df@pippilotta.erinye.com
f8433465a2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-05-23 08:40:39 +02: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
tomas@whalegate.ndb.mysql.com
2ff938d21c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-22 23:28:19 +02:00
tomas@whalegate.ndb.mysql.com
b789452743 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-05-22 23:21:55 +02:00
tomas@whalegate.ndb.mysql.com
a4934466c0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-22 23:21:32 +02:00