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

52452 commits

This branch
This branch
All branches
Author SHA1 Message Date
tnurnberg@white.intern.koehntopp.de
72b007864e Merge mysql.com:/misc/mysql/31752_/50-31752_ 
into  mysql.com:/misc/mysql/31752_/51-31752_
 2007-12-17 12:11:14 +01:00
tnurnberg@white.intern.koehntopp.de
5016d16507 Merge mysql.com:/misc/mysql/31752_/41-31752_ 
into  mysql.com:/misc/mysql/31752_/50-31752_
 2007-12-17 12:10:26 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
93894a444e Bug#31752: check strmake() bounds 
fix test program
 2007-12-17 12:09:21 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
491b664fad Bug#31752: check strmake() bounds 
build fixes
 2007-12-17 10:43:19 +01:00
tnurnberg@white.intern.koehntopp.de
1d84609890 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/32770/50-32770
 2007-12-17 09:56:40 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
94d7b8273f Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31752_/51-31752_
 2007-12-17 09:48:30 +01:00
tnurnberg@white.intern.koehntopp.de
f7aa719268 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31752_/50-31752_
 2007-12-17 09:45:36 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b2f867155f Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  mysql.com:/misc/mysql/31752_/41-31752_
 2007-12-17 09:42:55 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
efa1061a63 Merge mysql.com:/misc/mysql/31752_/50-31752_ 
into  mysql.com:/misc/mysql/31752_/51-31752_
 2007-12-17 09:16:47 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
e131a41281 Merge mysql.com:/misc/mysql/31752_/41-31752_ 
into  mysql.com:/misc/mysql/31752_/50-31752_
 2007-12-17 09:13:38 +01:00
istruewing@stella.local
03a24463ca Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-12-17 09:02:24 +01:00
tnurnberg@white.intern.koehntopp.de
786b3a2b16 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/32770/51-32770
 2007-12-17 08:10:13 +01:00
tnurnberg@white.intern.koehntopp.de
2ab88382ef Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/32770/50-32770
 2007-12-17 07:54:32 +01:00
tnurnberg@white.intern.koehntopp.de
4abda87881 Merge mysql.com:/misc/mysql/32770/50-32770 
into  mysql.com:/misc/mysql/32770/51-32770
 2007-12-17 07:49:26 +01:00
tnurnberg@white.intern.koehntopp.de
d611f84449 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/32350/51-32350
 2007-12-17 06:55:47 +01:00
tnurnberg@white.intern.koehntopp.de
a9cffb3e4d Merge mysql.com:/misc/mysql/32350/50-32350 
into  mysql.com:/misc/mysql/32350/51-32350
 2007-12-17 06:14:53 +01:00
tnurnberg@white.intern.koehntopp.de
c0f5a7cb69 Merge mysql.com:/misc/mysql/32350/41-32350 
into  mysql.com:/misc/mysql/32350/50-32350
 2007-12-17 06:13:52 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b52ac74d54 Bug#32350: mysqldump should show more version information in output 
show version of mysqldump, release of server et al., and version of
current server in mysqldumps.
 2007-12-17 06:13:26 +01:00
kostja@bodhi.(none)
16f0bd712e Try to fix assertion failures at slave shutdown when running 
rpl_ndb tests on sapsrv1.
 2007-12-15 22:24:01 +03:00
mhansson/martin@linux-st28.site
ca5f50788e 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 16:45:21 +01:00
kostja@bodhi.(none)
2e82e66677 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-15 17:05:39 +03:00
kostja@bodhi.(none)
4bb503568d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-12-15 17:00:18 +03:00
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
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
dkatz@damien-katzs-computer.local
4b5f344416 Bug #30252 Com_create_function is not incremented. 
Added Com_create_spfunction and all other commands previously missing to the global status variables.
 2007-12-14 18:27:40 -05: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
cmiller@zippy.cornsilk.net
880a202a56 Recorded silly ephemeral test. 2007-12-14 14:52:33 -05:00
serg@janus.mylan
b28b65ef38 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-14 20:46:39 +01:00
cmiller@zippy.cornsilk.net
edbacd3a99 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-12-14 13:42:09 -05: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
cmiller@zippy.cornsilk.net
c940d64a69 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-12-14 10:52:10 -05: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
cmiller@zippy.cornsilk.net
79bb729e54 Add profiling support for embedded server. 2007-12-14 09:39:57 -05:00
cmiller@zippy.cornsilk.net
62d29ea8d3 Correct complaints of reviewers and clean up test. 2007-12-14 08:57:37 -05: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
svoj@june.mysql.com
9cae71c32f Merge mysql.com:/home/svoj/devel/mysql/BUG22708/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-12-14 17:14:14 +04:00
svoj@june.mysql.com
fa948be663 Merge mysql.com:/home/svoj/devel/mysql/BUG25677/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2007-12-14 17:13:29 +04:00