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

52436 commits

This branch
This branch
All branches
Author SHA1 Message Date
tnurnberg@white.intern.koehntopp.de
1f5b0b3954 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/31990/51-31990
 2007-12-20 08:32:51 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
5a9225f4c2 Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE 
post-merge fixes
 2007-12-20 08:15:34 +01:00
tnurnberg@white.intern.koehntopp.de
38b888dd65 Merge mysql.com:/misc/mysql/31990/50-31990 
into  mysql.com:/misc/mysql/31990/51-31990
 2007-12-20 07:45:16 +01:00
davi@endora.local
ab6ef39cd1 Merge mysql.com:/Users/davi/mysql/bugs/28317-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2007-12-19 21:01:48 -02:00
davi@mysql.com/endora.local
cab36bdf57 Bug#28317 Left Outer Join with {oj outer-join} 
Parser rejects ODBC's escape sequences for outer joins other
than left outer join, yet the escape sequence BNF specifies
that this syntax can be used for left, right, and full outer
join syntax.

The problem is that although the MySQL Connector/ODBC advertises
"Outer Join Escape Sequence" capabilities, the parsing is done
in the server and historically it only supported this syntax
for left outer joins and applications such as Crystal Reports
11 tries to use this syntax for inner joins.

The chosen solution is to reorganize a couple of parser rules
to ignore any kind of SQL escape sequence. Ignoring the escape
sequences is harmless because the various SQL join clauses
are supported by the server.
 2007-12-19 20:59:57 -02:00
serg@janus.mylan
d902f4d3d6 Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-19 23:43:26 +01:00
serg@janus.mylan
59e0d6f3e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.0
 2007-12-19 23:39:11 +01:00
serg@janus.mylan
b07aaec21c Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-19 22:35:46 +01:00
serg@janus.mylan
4a5eb6bd17 correct invalid values in SET GLOBAL var=DEFAULT 
bug#33382
 2007-12-19 21:31:04 +01:00
kostja@bodhi.(none)
b9a41928e6 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-12-19 22:52:31 +03:00
kostja@bodhi.(none)
15c04b2db8 Make handler::{write,delete,update}_row private. It's critical 
that the entire server uses their public ha_* counterparts instead,
since only then we can ensure proper tracing of these calls that
is necessary for Bug#12713.
A pre-requisite for Bug#12713 "Error in a stored function called from 
a SELECT doesn't cause ROLLBACK of statem"
 2007-12-19 22:15:02 +03:00
mhansson/martin@linux-st28.site
0004b99b58 Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt 
into  linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848
 2007-12-19 15:59:05 +01:00
serg@janus.mylan
1a5b69ec58 SHOW_VAR arrays are null-terminated :-[] 2007-12-19 14:16:10 +01:00
serg@janus.mylan
3bd3bd1e30 Followup for bug#30252. 
Ensure that all SQLCOM_ constants have corresponding Com_ variables.
 2007-12-19 01:27:15 +01:00
serg@janus.mylan
87a84dbdc0 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-19 01:14:11 +01:00
kostja@bodhi.(none)
9d48e76b20 Sort class handler public declarations. 2007-12-19 00:36:20 +03:00
serg@janus.mylan
e97f18135c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-18 20:27:23 +01:00
dkatz@damien-katzs-computer.local
6b2815bedc Merge damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime 
into  damien-katzs-computer.local:/Users/dkatz/Com_create_function
 2007-12-18 13:52:26 -05:00
kostja@vajra.(none)
ef4295af44 Consistently use doxygen comments in class handler. 2007-12-18 15:47:22 +03:00
istruewing@stella.local
cd1b00e8bb Bug#32705 - myisam corruption: Key in wrong position 
at page 1024 with ucs2_bin

Inserting strings with a common prefix into a table with
characterset UCS2 corrupted the table.

An efficient search method was used, which compares end space
with ASCII blank. This doesn't work for character sets like UCS2,
which do not encode blank like ASCII does.

Use the less efficient search method _mi_seq_search()
for charsets with mbminlen > 1.
 2007-12-18 12:29:50 +01:00
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
df@pippilotta.erinye.com
92de4d5e78 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-12-17 19:08:55 +01:00
df@pippilotta.erinye.com
01b6c78fbe 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-12-17 19:01:14 +01: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
cmiller@zippy.cornsilk.net
6accbba0c0 Order results to be deterministic. 
Follow SergG's lead with mysqlcheck result.
 2007-12-17 08:51:29 -05:00
serg@janus.mylan
a2eb9e01ed Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
 2007-12-17 14:28:10 +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
joerg@trift2.
e591fc7cb8 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-17 14:10:01 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b89fabe164 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  mysql.com:/misc/mysql/31752_/41-31752_
 2007-12-17 14:06:15 +01:00
joerg@trift2.
af73c6c867 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-17 13:40:06 +01:00
joerg@trift2.
7bd4ac4df7 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-12-17 13:36:17 +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
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