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
38674 commits 2791 branches 343 tags 1.7 GiB
Commit graph

38674 commits

This branch
This branch
All branches
Author SHA1 Message Date
mhansson/martin@linux-st28.site
6f6e18809a Bug#32848: Data type conversion bug in union subselects in MySQL 5.0.38 
Warnings elimination
 2007-12-20 10:58:21 +01:00
tnurnberg@white.intern.koehntopp.de
d1637b2ec4 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/31990/50-31990
 2007-12-20 08:35:52 +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
4a5eb6bd17 correct invalid values in SET GLOBAL var=DEFAULT 
bug#33382
 2007-12-19 21:31:04 +01: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
mkindahl@dl145h.mysql.com
a9daa2cd86 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2007-12-19 14:49:04 +01: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
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
hezx@hezx.(none)
f858fe1064 Fixed some test case for BUG#32205 2007-12-18 15:43:51 +08: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
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@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@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.
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
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@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@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
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
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
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)
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
hezx@hezx.(none)
c2f00cc3f9 BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates fine 
The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
output with a delimeter appended right after it, if the query string ends with a '--'
comment, then the delimeter would be considered as part of the comment, if there are any
statements after this query, then it will cause a syntax error.

Start a newline before appending delimiter after a query string
 2007-12-15 19:50:23 +08: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
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
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
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
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.
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
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
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
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
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
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@mysql.com/eagle.(none)
8be07b88df additional fix 2007-12-13 23:46:29 +04:00
gluh@mysql.com/eagle.(none)
2627f775be valgrind error fix 2007-12-13 21:13:08 +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
tomas@whalegate.ndb.mysql.com
f84b45244d Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
 2007-12-13 14:25:16 +01:00
gluh@mysql.com/eagle.(none)
9df070ed7c after merge fix 2007-12-13 15:47:23 +04:00
tomas@whalegate.ndb.mysql.com
b009d97f84 Bug #33206 signal not reset properly in ndb 2007-12-13 12:03:11 +01: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