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

44609 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.local
95597c8371 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-21 23:59:37 +03:00
kostja@bodhi.local
c011a25f66 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2007-03-21 23:57:12 +03:00
evgen@moonbone.local
e2c9c9cc20 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/23345-bug-5.0-opt-mysql
 2007-03-21 22:10:33 +03:00
evgen@moonbone.local
72bf9b4847 Bug#23345: Wrongly allowed INTO in a non-last select of a UNION. 
INTO clause can be specified only for the last select of a UNION and it
receives the result of the whole query. But it was wrongly allowed in
non-last selects of a UNION which leads to a confusing query result.

Now INTO allowed only in the last select of a UNION.
 2007-03-21 21:54:38 +03:00
iggy@recycle.(none)
c1e6a4c404 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug27144/my50-bug27144
 2007-03-21 14:46:38 -04:00
omer@linux.site
c21a5bc8b1 Modifying mysql-test-run.pl to allow steeing of --secure-file-priv to 'mysql-test' when 
running suites other tha the main one
 2007-03-21 11:05:43 -07:00
iggy@recycle.(none)
762eae0bf1 Merge recycle.(none):/src/bug27144/my50-bug27144 
into  recycle.(none):/src/bug27144/my51-bug27144
 2007-03-21 14:01:39 -04:00
iggy@recycle.(none)
a763917a6f Bug#27144 sp-destruct.test is disabled on Windows 
- Update test to run properly on Windows.
 2007-03-21 13:58:11 -04:00
iggy@recycle.(none)
9800fbf0b6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  recycle.(none):/src/bug23736/my50-bug23736
 2007-03-21 13:43:03 -04:00
iggy@recycle.(none)
0d3aefcdf4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  recycle.(none):/src/bug23736/my51-bug23736
 2007-03-21 13:39:08 -04:00
kostja@bodhi.local
102f298a6f Fix warnings on Windows. 2007-03-21 20:32:15 +03:00
kostja@bodhi.local
39eafdd853 Fix a broken merge. 2007-03-21 19:20:44 +03:00
tomas@poseidon.mysql.com
2ff03a2267 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-21 16:35:40 +01:00
tomas@poseidon.mysql.com
e1cd5c67dc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-21 16:34:23 +01:00
df@pippilotta.erinye.com
fb33627284 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-03-21 16:01:34 +01:00
df@pippilotta.erinye.com
eff3e782ae 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-03-21 16:00:09 +01:00
cbell/Chuck@mysql_cab_desk.
f0936e9441 Merge mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_25543
 2007-03-21 10:56:43 -04:00
df@pippilotta.erinye.com
dc710af806 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-03-21 15:53:11 +01:00
df@pippilotta.erinye.com
306af19625 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
 2007-03-21 15:52:24 +01:00
df@pippilotta.erinye.com
069a2189c1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-03-21 15:50:33 +01:00
df@pippilotta.erinye.com
677ca6bb5b fix shell script 2007-03-21 15:49:51 +01:00
jonas@perch.ndb.mysql.com
48768c6dc8 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-03-21 15:42:13 +01:00
jonas@perch.ndb.mysql.com
ca00e63853 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-21 15:37:14 +01:00
jonas@perch.ndb.mysql.com
2cd7ff4e8a Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-21 15:36:23 +01:00
jonas@perch.ndb.mysql.com
8a149f2638 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-21 15:35:22 +01:00
jonas@perch.ndb.mysql.com
b950160a46 ndb - bug#27283 
Additional fix for 2-node case
 2007-03-21 15:34:47 +01:00
df@pippilotta.erinye.com
90da5ed40f Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-03-21 15:00:55 +01:00
df@pippilotta.erinye.com
45b80e686e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-03-21 15:00:30 +01:00
df@pippilotta.erinye.com
4cae191d01 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-26701 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-26701
 2007-03-21 14:58:12 +01:00
msvensson@pilot.blaudden
a0c2fae01f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:34:25 +01:00
msvensson@pilot.blaudden
31b2f339a0 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-21 14:30:47 +01:00
msvensson@pilot.blaudden
7c5df4d35b Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-21 14:24:50 +01:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
79216dad87 Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-build 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
 2007-03-21 13:16:03 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
ac1c81ddcf Merge dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug26079_binlog_max_innodb 
into  dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/MAIN/mysql-5.1-new-maint
 2007-03-21 13:14:12 +02:00
tomas@whalegate.ndb.mysql.com
db9a44ce49 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-21 09:29:03 +01:00
tomas@whalegate.ndb.mysql.com
c01f31654b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-21 09:28:37 +01:00
holyfoot/abotchkov@mysql.com/bk-internal.mysql.com
9d4a0118d8 mysqlbinlog-cp932.test: 
merging
 2007-03-21 09:28:26 +01:00
tomas@whalegate.ndb.mysql.com
d2f8bd9ae7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-21 09:28:22 +01:00
tomas@whalegate.ndb.mysql.com
75c41e17b9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-21 09:27:13 +01:00
tomas@whalegate.ndb.mysql.com
ca118237bb 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-03-21 09:26:05 +01:00
tomas@whalegate.ndb.mysql.com
585782e084 Bug #26825 MySQL Server Crashes in high load 
- initialize to NULL, to avoid call of free on uninitialized variable
 2007-03-21 09:23:49 +01:00
pekka@clam.ndb.mysql.com/clam.(none)
2e8bec03f7 ndb - bug#24028 in 5.0 
proper fix exists only in version >= 5.1
 2007-03-21 09:13:05 +01:00
tomas@whalegate.ndb.mysql.com
ba74604c56 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-21 09:08:05 +01:00
jonas@perch.ndb.mysql.com
62fde95e08 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-21 09:07:55 +01:00
jonas@perch.ndb.mysql.com
762ddadc24 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-21 09:06:44 +01:00
jonas@perch.ndb.mysql.com
75e0f57e3e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-03-21 09:06:14 +01:00
tomas@whalegate.ndb.mysql.com
37b8c96197 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-03-21 09:00:38 +01:00
jonas@perch.ndb.mysql.com
b996817294 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-21 08:59:57 +01:00
jonas@perch.ndb.mysql.com
7834bd5846 ndb - bug#27286 (5.0 version) 
make sure master is sendable
 2007-03-21 08:57:14 +01:00
jonas@perch.ndb.mysql.com
ec97b008f0 ndb - bug#27286 
make sure master node is sendable, when getting ref::NotMaster
 2007-03-21 08:47:54 +01:00