mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52340 commits 2784 branches 343 tags 1.6 GiB
Commit graph

52340 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.(none)
bffc615e6c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-15 16:59:43 +03:00
mhansson/martin@linux-st28.site
59314ee35b Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt 
into  linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858-push
 2007-12-15 12:07:33 +01:00
mhansson/martin@linux-st28.site
bcfdd27481 Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt 
into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push
 2007-12-15 12:02:33 +01:00
mhansson/martin@linux-st28.site
e8d1380263 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 
into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my51-bug32798-united-push
 2007-12-15 11:54:02 +01:00
tomas@whalegate.ndb.mysql.com
c629bd3361 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-15 09:23:49 +01:00
tomas@whalegate.ndb.mysql.com
b7a869f36e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-12-15 09:20:41 +01:00
igor@olga.mysql.com
43582593c3 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27848
 2007-12-14 18:17:52 -08:00
malff@lambda.hsd1.co.comcast.net.
0488056ca8 WL#4165 (Prepared statements: validation) 
Adding the tests cases alone for WL#4165, disabled
 2007-12-14 17:46:24 -07:00
igor@olga.mysql.com
f25e30ebed Fixed bug #27848. 
In a union without braces, the order by at the end is applied to the 
overall union. It therefore should not interfere with the individual
select parts of the union.

Fixed by changing our parser rules appropriately.
 2007-12-14 13:42:46 -08:00
iggy@amd64.(none)
6bb288b6b7 Bug#26811 Symbolic links don't work in Windows Vista 
- Enable check for symbolic link files.
 2007-12-14 15:49:51 -05:00
kent/mysqldev@mysql.com/production.mysql.com
fb8cceb06e sp_head.cc: 
Corrected typo
 2007-12-14 21:38:58 +01:00
kent/mysqldev@mysql.com/production.mysql.com
7ca11181ac sp_head.cc: 
Made sp_head::operator delete() match prototype, added throw()
mysql_test_run.c, mysqld_safe.c:
  Include "mysql_version.h" to get MYSQL_PORT defined
 2007-12-14 18:23:11 +01:00
tomas@whalegate.ndb.mysql.com
2db742573d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-14 18:05:15 +01:00
tomas@whalegate.ndb.mysql.com
1a3bf7333e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
 2007-12-14 18:03:44 +01:00
tomas@whalegate.ndb.mysql.com
d2a93fd60b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-14 17:49:58 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
8105bd467b Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0 
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1
 2007-12-14 16:02:31 +00:00
kent/mysqldev@mysql.com/production.mysql.com
028ed33610 Raise version number after cloning 5.0.54 2007-12-14 16:58:12 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
2a404c23ba Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0
 2007-12-14 15:46:19 +00:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
89153ffa1b post-commit: 
Rationalise setting $FROM.
 2007-12-14 15:43:54 +00:00
anozdrin/alik@station.
6ebedc8635 Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
 2007-12-14 16:45:17 +03:00
anozdrin/alik@station.
151444c626 Merge station.:/mnt/raid/alik/MySQL/devel/5.1 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2007-12-14 16:30:22 +03:00
anozdrin/alik@station.
61b903f896 Merge station.:/mnt/raid/alik/MySQL/devel/5.0 
into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt
 2007-12-14 15:57:36 +03:00
tomas@whalegate.ndb.mysql.com
0de8ac6ffd Bug #33237 NDB_MGM 'eat' 99% cpu utilization 2007-12-14 13:43:48 +01:00
mhansson/martin@linux-st28.site
f282ce6fb6 Bug#32798: DISTINCT in GROUP_CONCAT clause fails when ordering by 
a column with null values

Post-merge fix
 2007-12-14 13:35:52 +01:00
mhansson/martin@linux-st28.site
8e8ba8e825 Merge linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united 
into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my51-bug32798-united
 2007-12-14 12:40:39 +01:00
tsmith@ramayana.hindu.god
3a6b30527b Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b33192/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2007-12-14 04:26:06 -07:00
mhansson/martin@linux-st28.site
cdeecc5154 Bug#32798: DISTINCT in GROUP_CONCAT clause fails when ordering by a column 
with null values

For queries containing GROUP_CONCAT(DISTINCT fields ORDER BY fields), there 
was a limitation that the DISTINCT fields had to be the same as ORDER BY 
fields, owing to the fact that one single sorted tree was used for keeping 
track of tuples, ordering and uniqueness. Fixed by introducing a second 
structure to handle uniqueness so that the original structure has only to 
order the result.
 2007-12-14 12:24:20 +01:00
mhansson@dl145s.mysql.com
8ddb5ab98d Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data0/mhansson/my51-bug32858
 2007-12-14 11:13:35 +01:00
df@pippilotta.erinye.com
04d815cf39 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-12-14 10:52:21 +01:00
df@pippilotta.erinye.com
26bd6a2cf1 typo 2007-12-14 10:51:05 +01:00
df@pippilotta.erinye.com
be2d78e397 BUG#31880 make test failure from public bk tree 2007-12-14 10:47:01 +01:00
tomas@whalegate.ndb.mysql.com
0f58ed97c1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-14 08:20:07 +01:00
tomas@whalegate.ndb.mysql.com
0bd2a86e90 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-14 06:55:44 +01:00
tomas@whalegate.ndb.mysql.com
70902cdd86 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-14 06:53:55 +01:00
kostja@bodhi.(none)
614b0f6884 Remove an unused argument of sql_update::do_updates(). 2007-12-14 02:23:42 +03:00
kostja@bodhi.(none)
7c8fe302c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-13 23:59:47 +03:00
kostja@bodhi.(none)
5b80d6a11b Fix broken embedded build (broken by the patch for Bug#12713, first part). 2007-12-13 23:58:55 +03:00
tomas@whalegate.ndb.mysql.com
a2486e0d14 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-12-13 21:51:03 +01:00
tomas@whalegate.ndb.mysql.com
4bc90fe469 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-13 21:50:17 +01:00
tomas@whalegate.ndb.mysql.com
e9466462e8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2007-12-13 21:32:45 +01:00
tomas@whalegate.ndb.mysql.com
3a89198273 Bug #33168 Incorrectly handled parameters can make the TC crash during node failure 
- during commit deadlock timeout needs to be at least 5 times db hearbeat
 2007-12-13 21:31:38 +01:00
gluh@eagle.(none)
27dcbc2577 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 23:48:13 +04:00
gluh@mysql.com/eagle.(none)
8be07b88df additional fix 2007-12-13 23:46:29 +04:00
dkatz@damien-katzs-computer.local
af6db482d5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  damien-katzs-computer.local:/Users/dkatz/51runtime
 2007-12-13 14:31:20 -05:00
davi@endora.local
d099e6a257 Merge mysql.com:/Users/davi/mysql/bugs/32395-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2007-12-13 16:33:04 -02:00
gluh@eagle.(none)
b98f95274c Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 21:34:50 +04:00
gluh@mysql.com/eagle.(none)
b371f6385d additional after merge fix 2007-12-13 21:34:05 +04:00
gluh@mysql.com/eagle.(none)
2627f775be valgrind error fix 2007-12-13 21:13:08 +04:00
gluh@mysql.com/eagle.(none)
5244d7dcf6 after merge fix 2007-12-13 18:26:27 +04:00
tomas@whalegate.ndb.mysql.com
6821f36837 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-13 15:02:10 +01:00