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
29737 commits 2785 branches 343 tags 1.6 GiB
Commit graph

29737 commits

This branch
This branch
All branches
Author SHA1 Message Date
kroki@mysql.com
2caec302fa Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15933
 2006-04-13 00:04:22 +04:00
evgen@moonbone.local
ac54aa2aee Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was 
used

In a simple queries a result of the GROUP_CONCAT() function was always of 
varchar type.
But if length of GROUP_CONCAT() result is greater than 512 chars and temporary
table is used during select then the result is converted to blob, due to
policy to not to store fields longer than 512 chars in tmp table as varchar
fields.

In order to provide consistent behaviour, result of GROUP_CONCAT() now
will always be converted to blob if it is longer than 512 chars.
Item_func_group_concat::field_type() is modified accordingly.
 2006-04-12 23:05:38 +04:00
kroki@mysql.com
c8e22ff70b Bug#16461: connection_id() does not work properly inside trigger 
CONNECTION_ID() was implemented as a constant Item, i.e. an instance of
Item_static_int_func class holding value computed at creation time.
Since Items are created on parsing, and trigger statements are parsed
on table open, the first connection to open a particular table would
effectively set its own CONNECTION_ID() inside trigger statements for
that table.

Re-implement CONNECTION_ID() as a class derived from Item_int_func, and
compute connection_id on every call to fix_fields().
 2006-04-12 19:31:00 +04:00
konstantin@mysql.com
75792fc0dc Merge mysql.com:/opt/local/work/mysql-4.1-16365 
into  mysql.com:/opt/local/work/mysql-5.0-merge
 2006-04-12 18:30:54 +04:00
kroki@mysql.com
8881e660d0 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0 
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug15933
 2006-04-12 17:39:24 +04:00
kroki@mysql.com
4a81c0dfb9 In test for bug#15933 we have to wait for all disconnects to finish to avoid 
a race between updating and checking Max_used_connections.  This is done in
a loop until either disconnect finished or timeout expired.  In a latter case
the test will fail.
 2006-04-12 17:37:57 +04:00
aelkin@mysql.com
a219eb292e #BUG18715 create view with replicate*ignore-table 
Fixed in parser. rpl_view gained no changes but rpl_view-slave.opt.
 2006-04-12 12:50:12 +03:00
msvensson@neptunus.(none)
7c70159097 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-12 09:09:22 +02:00
cmiller@zippy.(none)
a1e78b3d36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-11 16:39:09 -04:00
igor@rurik.mysql.com
abc16b5b00 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-11 11:46:28 -07:00
ramil@mysql.com
62b85c1388 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14360
 2006-04-11 23:46:27 +05:00
aivanov@mysql.com
cb011af0b0 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-merge
 2006-04-11 22:46:26 +04:00
msvensson@neptunus.(none)
a4b19285e5 Bug#18474 Unlistable directories yield no info from information_schema, part2 
- Improved solution by adding an else stetment so that do find next is avoided if erorr occurs, but we still return zero files found instaed of an error
 2006-04-11 20:41:05 +02:00
igor@rurik.mysql.com
dfd8f0211c Fixed bug #18618. 
If the second or the third argument of a BETWEEN predicate was
a constant expression, like '2005.09.01' - INTERVAL 6 MONTH,
while the other two arguments were fields then the predicate 
was evaluated incorrectly and the query returned a wrong
result set.
The bug was introduced in 5.0.17 when in the fix for 12612.
 2006-04-11 10:03:37 -07:00
ingo@mysql.com
76a122d0c3 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-bug5390
 2006-04-11 17:10:04 +02:00
ingo@mysql.com
2ef6034165 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-bug5390
 2006-04-11 15:18:16 +02:00
ramil@mysql.com
094c4290ca Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14360
 2006-04-11 18:14:34 +05:00
bell@sanja.is.com.ua
b4980d4383 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2006-04-11 14:49:33 +03:00
ramil@mysql.com
1e29244200 Fix for bug #14360: Date Between Interval Broken. 2006-04-11 16:13:57 +05:00
ingo@mysql.com
fff2bc4d46 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-11 12:41:26 +02:00
ramil@mysql.com
32cabaa39f after merge fix. 2006-04-11 15:26:18 +05:00
ramil@mysql.com
a2cd8beb96 Merge mysql.com:/usr/home/ram/work/mysql-4.0 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2006-04-11 13:53:44 +05:00
msvensson@neptunus.(none)
abf41982f8 Add surrounding braces, move invalidate dictionary_cace to after declaration of variable "table_list" 2006-04-11 09:46:03 +02:00
msvensson@neptunus.(none)
875154606e Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-11 09:09:21 +02:00
bell@sanja.is.com.ua
11f59e3930 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
 2006-04-11 10:03:53 +03:00
ingo@mysql.com
22431de4e0 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-11 08:46:48 +02:00
ramil@mysql.com
4791ce7942 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/usr/home/ram/work/mysql-4.0
 2006-04-11 10:46:21 +05:00
jimw@mysql.com
0647a26ade Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-10 16:17:46 -07:00
jimw@mysql.com
a159a55c2c Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-10 14:30:00 -07:00
igor@rurik.mysql.com
e2feeb88f9 Made the test case for bug #15917 independent on platforms. 2006-04-10 14:14:20 -07:00
igor@rurik.mysql.com
406b29b6e0 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-10 13:04:25 -07:00
bell@sanja.is.com.ua
ff698513e5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
 2006-04-10 22:00:03 +03:00
bell@sanja.is.com.ua
5fe95af804 Avoid trying to include <asm/atomic.h> when it doesn't work in C++ 
code. (Bug #13621)
 2006-04-10 21:57:29 +03:00
ingo@mysql.com
5824ec03e1 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-10 20:48:10 +02:00
knielsen@mysql.com
030c170550 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp
 2006-04-10 20:48:09 +02:00
aivanov@mysql.com
31727db005 Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868 
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
 2006-04-10 22:48:08 +04:00
aivanov@mysql.com
6ad6cda2ca Fixed test case result (after BUG#15868 fix). 2006-04-10 22:44:01 +04:00
jimw@mysql.com
fec9005e87 Merge mysql.com:/home/jimw/my/mysql-5.0-13601 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-10 11:23:30 -07:00
knielsen@mysql.com
4088329ba0 Merge mysql.com:/usr/local/mysql/mysql-5.0-fixcast 
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp
 2006-04-10 17:58:22 +02:00
ingo@mysql.com
1c0f675377 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2006-04-10 17:58:21 +02:00
knielsen@mysql.com
1f9d96430d Merge mysql.com:/usr/local/mysql/mysql-4.1-vgfix 
into  mysql.com:/usr/local/mysql/mysql-5.0-tmp
 2006-04-10 17:58:21 +02:00
aivanov@mysql.com
aeeb19920d Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868
 2006-04-10 19:58:20 +04:00
aivanov@mysql.com
bb94bb30d0 Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'. 
Applied changes due Heikki Tuuri.
 2006-04-10 19:47:41 +04:00
msvensson@neptunus.(none)
6b1f72c1a7 Merge 192.168.0.20:mysql/bug15069/my50-bug15069 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-10 15:13:30 +02:00
msvensson@shellback.(none)
475e1f6a53 Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir 
- Grab the path from "configure --sysconfdir=<path>" and set it as
   the first place to look for my.cnf files
   Do this both in Makefiles for libmysql and mysys
 - Patch provided by Francesco Riosa. Thank you!
 2006-04-10 15:11:37 +02:00
knielsen@mysql.com
587627b1fc Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-4.1
 2006-04-10 13:05:35 +02:00
jonas@perch.ndb.mysql.com
775527103d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-04-10 10:30:27 +02:00
jonas@perch.ndb.mysql.com
e4e61b091a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-10 09:56:57 +02:00
knielsen@mysql.com
b9d427ca27 Fix test case 'cast' on Windows, different floating point output format. 2006-04-10 09:31:46 +02:00
jonas@perch.ndb.mysql.com
7e0733fedc Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-10 08:29:24 +02:00