mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
47927 commits 2778 branches 343 tags 1.6 GiB
Commit graph

47927 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@pippilotta.erinye.com
7eea7fff35 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
 2007-06-19 12:10:48 +02:00
df@pippilotta.erinye.com
26d83baeaf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
 2007-06-19 12:05:17 +02:00
df@pippilotta.erinye.com
f927d50509 try again. 2007-06-19 12:03:10 +02:00
tomas@whalegate.ndb.mysql.com
027456393e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:38:37 +02:00
tomas@whalegate.ndb.mysql.com
b36a87ae91 corrected typo 2007-06-19 11:38:07 +02:00
msvensson@pilot.(none)
b8eee54d0b Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-19 11:34:54 +02:00
tomas@whalegate.ndb.mysql.com
9d8fbc462b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:31:52 +02:00
msvensson@pilot.(none)
95cf973862 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-19 11:31:34 +02:00
tomas@whalegate.ndb.mysql.com
955c40dece WL#3303 
- get the ndb flags right, so that the behaviour is as before
 2007-06-19 11:31:25 +02:00
msvensson@pilot.(none)
e003d8ad3b Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
 2007-06-19 11:30:45 +02:00
tomas@whalegate.ndb.mysql.com
04f1913789 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-19 11:26:23 +02:00
tomas@whalegate.ndb.mysql.com
a67e755593 turn off binlogging of the updates during wait for not_readonly 2007-06-19 11:25:19 +02:00
mats@kindahl-laptop.dnsalias.net
1447f6318f Fixes to tests and test results. 2007-06-19 11:09:22 +02:00
msvensson@pilot.(none)
f52b9d6150 Merge pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232 
into  pilot.(none):/data/msvensson/mysql/wl3232/my51-wl3232
 2007-06-19 11:08:29 +02:00
msvensson@pilot.(none)
6c22726ebd Merge pilot.(none):/data/msvensson/mysql/wl3232/my41-wl3232 
into  pilot.(none):/data/msvensson/mysql/wl3232/my50-wl3232
 2007-06-19 11:07:39 +02:00
msvensson@pilot.(none)
caebb719b2 WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file> 
- Add test case for this already existing feature
 2007-06-19 11:06:02 +02:00
msvensson@pilot.(none)
46f0c05afc Bug#28769 Test case "innodb" fails with --skip-log-bin 
- Move binlog related tests to binlog_innodb.test
 - Remove "source include/have_log_bin.inc" from innodb.test
 2007-06-19 09:56:19 +02:00
holyfoot/hf@hfmain.(none)
46405f5a25 Merge mysql.com:/home/hf/work/29117/my50-29117 
into  mysql.com:/home/hf/work/29117/my51-29117
 2007-06-19 12:32:18 +05:00
holyfoot/hf@hfmain.(none)
438422d929 Merge mysql.com:/home/hf/work/29117/my41-29117 
into  mysql.com:/home/hf/work/29117/my50-29117
 2007-06-19 12:31:37 +05:00
thek@adventure.(none)
a0b8394c23 Merge adventure.(none):/home/thek/Development/cpp/bug28211/my51-bug28211 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-06-19 09:13:17 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
5a9d6856de Bug #29117 (init_file test crashes with embedded server) 
we use net->vio in my_net_local_init, but in the my_net_init
implementation we set it after the call, so work with unspecified
net->vio value
 2007-06-19 11:13:11 +05:00
dkatz@damien-katzs-computer.local
e1ea1cb66f Bug #28921 Queries containg UDF functions are cached 
Additional edits to the 5.0 ChangeSet|1.2519 that are necessary for the fix to work with the new code structure in 5.1.
 2007-06-18 21:11:10 -04:00
dkatz@damien-katzs-computer.local
f9de8dc217 Merge damien-katzs-computer.local:/Users/dkatz/mysql50 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-06-18 20:01:04 -04:00
tomas@whalegate.ndb.mysql.com
6a51e0f8a2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-06-18 23:55:48 +02:00
dkatz@damien-katzs-computer.local
b7a2b41374 Bug #28921 Queries containing UDF functions are cached 
Fixed runtime to no longer allow the caching of queries with UDF calls.
 2007-06-18 17:55:12 -04:00
tomas@whalegate.ndb.mysql.com
f3a7284521 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-06-18 23:49:30 +02:00
dkatz@damien-katzs-computer.local
b89e4f9ef2 Bug #29053 SQL_CACHE in UNION causes non-deterministic functions to be cached 
Changed code to enforce that SQL_CACHE only in the first SELECT is used to turn on caching(as documented), but any SQL_NO_CACHE will turn off caching (not documented, but a useful behaviour, especially for machine generated queries). Added test cases to explicitly test the documented caching behaviour and test cases for the reported bug.
 2007-06-18 17:16:20 -04:00
tsmith@maint1.mysql.com
eb6142bb36 Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-18 22:20:30 +02:00
tsmith@maint1.mysql.com
46772d36e2 Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/41 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-18 22:18:21 +02:00
tsmith@maint1.mysql.com
3f52ef0ee2 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-18 22:13:23 +02:00
tsmith@maint1.mysql.com
c658464813 Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-06-18 22:11:49 +02:00
tsmith@maint1.mysql.com
b6bd61d4d4 Merge maint1.mysql.com:/data/localhome/tsmith/bk/41 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
 2007-06-18 22:10:54 +02:00
joerg@trift2.
2e31f40819 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-18 21:48:33 +02:00
joerg@trift2.
0608cafbfb Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-18 21:46:27 +02:00
joerg@trift2.
7e060d76b1 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 21:24:54 +02:00
joerg@trift2.
f0d63496b5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 21:20:03 +02:00
joerg@trift2.
57853e7dfe Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-18 21:16:09 +02:00
df@pippilotta.erinye.com
09ff8d09d7 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-06-18 20:30:11 +02:00
df@pippilotta.erinye.com
f52337a6d1 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-06-18 20:24:47 +02:00
df@pippilotta.erinye.com
03d9ef1f19 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:23:35 +02:00
joerg@trift2.
4f6b3d107b Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-18 20:22:18 +02:00
df@pippilotta.erinye.com
0ef1abae78 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:18:58 +02:00
df@pippilotta.erinye.com
dd7185eadd 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-06-18 20:18:32 +02:00
df@pippilotta.erinye.com
1067f08ac9 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
 2007-06-18 20:18:26 +02:00
df@pippilotta.erinye.com
e9387bf5ce Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-18 20:15:27 +02:00
df@pippilotta.erinye.com
94a3e239c5 don't use bk cset in commit e-mails 2007-06-18 20:13:33 +02:00
joerg@trift2.
cf95b9e40e Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-06-18 19:44:58 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5b22bc3bd5 Sdditional fix-up for bug #26380: LOCK TABLES + FLUSH LOGS causes deadlock 
FLUSH LOGS should ignore SET GLOBAL READ_ONLY.
 2007-06-18 22:22:31 +05:00
joerg@trift2.
1d09be3804 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-18 19:16:12 +02:00
tomas@whalegate.ndb.mysql.com
55c6e7b142 check for different error message 2007-06-18 17:57:16 +02:00