mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39953 commits 2785 branches 343 tags 1.6 GiB
Commit graph

14869 commits

Author SHA1 Message Date
petr/cps@outpost.site
fb650b8aad Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime
 2006-11-08 00:07:23 +03:00
anozdrin/alik@alik.
ee15c11b7c Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
 2006-11-07 16:24:35 +03:00
petr/cps@outpost.site
1b44fe6196 Fix Bug #22494 Instance Manager: Inconsistent error message wording 
Use better wording
 2006-11-07 05:21:33 +03:00
petr/cps@outpost.site
b28b07f09f Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
 2006-11-06 00:19:55 +03:00
petr/cps@outpost.site
0372ca79ff fix mysql-test-run.pl to support --timezone option, 
which got broken during refactoring.
 2006-11-06 00:14:04 +03:00
msvensson@neptunus.(none)
a56565b8d5 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-04 13:06:51 +01:00
msvensson@neptunus.(none)
56f10ac81a Remove old comments 2006-11-04 13:06:19 +01:00
msvensson@neptunus.(none)
abd1e54de7 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-04 09:32:36 +01:00
msvensson@neptunus.(none)
83a44bd8ff Disable user_limits for bug23921 2006-11-04 09:24:10 +01:00
msvensson@neptunus.(none)
d59a3b4d43 Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-04 09:20:20 +01:00
malff/marcsql@weblab.(none)
ff4a58bcc8 Bug#21114 (Foreign key creation fails to table with name format) 
Fixed the tests for case insensitive platforms
 2006-11-03 09:56:44 -07:00
msvensson@neptunus.(none)
aa19771c7a Fiexes for --stress mode in mysql-test-run.pl 2006-11-03 17:53:57 +01:00
msvensson@neptunus.(none)
899dca14ee Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-03 17:53:10 +01:00
msvensson@neptunus.(none)
63091e074a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-03 16:18:32 +01:00
msvensson@neptunus.(none)
78af4ae44c Fix problem with mysql.test relying on "echo" behaviour 2006-11-03 16:09:16 +01:00
msvensson@neptunus.(none)
570f603988 Don't warn about "Found non pid file" for elements that are not files. 2006-11-03 15:26:42 +01:00
msvensson@neptunus.(none)
b850ae8a54 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-03 14:40:52 +01:00
msvensson@neptunus.(none)
5c086315a5 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
 2006-11-03 13:14:33 +01:00
msvensson@neptunus.(none)
795ad91bc3 Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that. 2006-11-03 13:12:16 +01:00
msvensson@neptunus.(none)
1c19dc7ed0 Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress 
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
 2006-11-03 12:58:45 +01:00
msvensson@neptunus.(none)
7b4a8e41a6 Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well. 2006-11-03 12:32:05 +01:00
anozdrin/alik@alik.
18fb4abff4 Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-11-03 14:00:35 +03:00
msvensson@neptunus.(none)
d94101f796 Fix typo, Add "s" to format specifier for --stress-init-file 2006-11-03 11:42:22 +01:00
kroki/tomash@moonlight.intranet
6967657466 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
 2006-11-03 12:47:32 +03:00
kroki/tomash@moonlight.intranet
d5a69e6fa2 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
 2006-11-03 12:30:09 +03:00
kroki/tomash@moonlight.intranet
1dbf98d162 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-cleanup 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup
 2006-11-03 12:25:34 +03:00
kroki/tomash@moonlight.intranet
fbf508d686 Cleanup: fix race in rename.test. 2006-11-03 12:16:31 +03:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-02 17:51:59 -05:00
cmiller@zippy.cornsilk.net
af5acac047 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-02 17:39:52 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-02 17:27:42 -05:00
malff/marcsql@weblab.(none)
181459d444 Post merge fix 2006-11-02 14:02:07 -07:00
iggy@rolltop.ignatz42.dyndns.org
2704ba3675 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-11-02 15:16:33 -05:00
iggy@rolltop.ignatz42.dyndns.org
deb03b93ec Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-11-02 15:14:50 -05:00
iggy@rolltop.ignatz42.dyndns.org
cf65c157ee Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config
 2006-11-02 15:11:22 -05:00
iggy@rolltop.ignatz42.dyndns.org
9f329f2cf2 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
 2006-11-02 15:09:23 -05:00
iggy@rolltop.ignatz42.dyndns.org
39d7c5a6bc Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations 
Visual Studio builds each configuration in a different sub-directory.  Only the sub-
directories for release and debug are currently searched.
 2006-11-02 15:05:20 -05:00
malff/marcsql@weblab.(none)
48a87f8ae0 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21114_b
 2006-11-02 11:13:04 -07:00
malff/marcsql@weblab.(none)
62c242cc75 Bug#21114 (Foreign key creation fails to table with name format) 
Due to the complexity of this change, everything is documented in WL#3565

This patch is the third iteration, it takes into account the comments
received to date.
 2006-11-02 11:01:53 -07:00
andrey@example.com
63f7ca0662 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  example.com:/work/mysql-5.1-runtime-bug22830-new
 2006-11-02 13:59:44 +01:00
andrey@example.com
c27a88ca2d Better fix for bug#22830 
Events: crash with procedure which alters events with function

Post-review CS

This fix also changes the handling of KILL command combined with
subquery. It changes the error message given back to "not supported",
from parse error. The error for CREATE|ALTER EVENT has also been changed
to generate "not supported yet" instead of parse error.
In case of a SP call, the error is "not supported yet". This change
cleans the parser from code which should not belong to there. Still
LEX::expr_allows_subselect is existant because it simplifies the handling
 of SQLCOM_HA_READ which forbids subselects.
 2006-11-02 13:51:43 +01:00
thek@kpdesk.mysql.com
5f2424ead7 Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2006-11-02 08:47:21 +01:00
kostja@bodhi.local
b2978f9ee8 A post-merge fix. 2006-11-02 08:58:51 +03:00
kostja@bodhi.local
965669d1f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:24:11 +03:00
kostja@bodhi.local
b471ea50f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-11-02 01:21:37 +03:00
kostja@bodhi.local
6a28c436f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-02 01:08:39 +03:00
monty@nosik.monty.fi
d745fe49fe Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-01 19:46:23 +02:00
monty@mysql.com/nosik.monty.fi
ca99516cc7 Fixed a lot of compiler warnings (Mainly in mysqld and instance manager) 
Fixed some possible fatal wrong arguments to printf() style functions
Initialized some not initialized variables
Fixed bug in stored procedure and continue handlers
(Fixes Bug#22150)
 2006-11-01 19:41:09 +02:00
petr/cps@owlet.local
3df8165cf9 Merge mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191 
into  mysql.com:/home/cps/mysql/trees/5.1-runtime-bug9191
 2006-11-01 18:18:01 +03:00
msvensson@shellback.(none)
8d29d65cf3 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-01 16:16:34 +01:00
petr/cps@mysql.com/owlet.local
7974bf90aa Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191 
into  mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
 2006-11-01 17:35:35 +03:00