mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51980 commits 2781 branches 343 tags 1.6 GiB
Commit graph

51980 commits

This branch
This branch
All branches
Author SHA1 Message Date
gkodinov/kgeorge@magare.gmz
af1231fa80 Merge magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B19390-5.1-opt
 2007-12-18 11:07:08 +02:00
gkodinov/kgeorge@magare.gmz
1a8b8eb91c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt
 2007-12-18 10:45:05 +02:00
gkodinov/kgeorge@magare.gmz
695342d676 Bug #19390: Test 'rpl_trigger' fails, might be random 
The checks in the test for bug #12480 were too wide and
made the test to depend on the procedures and triggers
present in the server.
Corrected the test to check only for the procedure and 
trigger it creates.
 2007-12-17 18:56:39 +02:00
tnurnberg@sin.intern.azundris.com
c25619f25f Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  sin.intern.azundris.com:/misc/mysql/32770/51-32770
 2007-12-17 16:22:00 +01:00
tnurnberg@white.intern.koehntopp.de
e6fc773b43 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/32770/50-32770
 2007-12-17 16:16:39 +01:00
tnurnberg@white.intern.koehntopp.de
977a189e24 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31752_/50-31752_
 2007-12-17 14:17:18 +01:00
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
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
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
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
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
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
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
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
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
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
gluh@mysql.com/eagle.(none)
3b227392c9 after merge fix 2007-12-13 16:43:38 +04:00
gluh@eagle.(none)
d504588e79 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 16:10:57 +04:00
mhansson@dl145s.mysql.com
9ea44d7de9 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data0/mhansson/my51-bug32858
 2007-12-13 13:06:00 +01:00
gluh@eagle.(none)
4f5868114a Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-12-13 15:56:04 +04:00
gluh@mysql.com/eagle.(none)
9df070ed7c after merge fix 2007-12-13 15:47:23 +04:00
gluh@eagle.(none)
ffeb563d60 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-12-13 14:53:24 +04:00
gluh@eagle.(none)
e039595029 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-12-13 14:52:49 +04:00
mhansson/martin@linux-st28.site
8abd4082ac Merge linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858 
into  linux-st28.site:/home/martin/mysql/src/bug32858/my51-bug32858
 2007-12-13 11:41:07 +01:00
sergefp@foxhole.(none)
9f4f6acc53 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug32198
 2007-12-13 13:39:37 +03:00
sergefp@mysql.com
dd0854db54 BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly 
- Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable
 2007-12-13 13:38:22 +03:00
gluh@mysql.com/eagle.(none)
4e50bb0ebe Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-12-13 14:38:01 +04:00
mhansson/martin@linux-st28.site
33c4431d39 Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take 
subselects into account

It is forbidden to use the SELECT INTO construction inside UNION statements
unless on the last SELECT of the union. The parser records whether it 
has seen INTO or not when parsing a UNION statement. But if the INTO was
legally used in an outer query, an error is thrown if UNION is seen in a
subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and 
mitigate the error unless it collides with the UNION.
 2007-12-13 11:19:05 +01:00