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

9893 commits

Author SHA1 Message Date
igor@rurik.mysql.com
7b0373a557 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:27:18 -07:00
igor@rurik.mysql.com
27cc6f4bc3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:08:15 -07:00
igor@rurik.mysql.com
67458961cf Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol. 2006-04-19 16:08:37 -07:00
igor@rurik.mysql.com
881b55d503 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-2
 2006-04-19 14:42:51 -07:00
jimw@mysql.com
b57eb9e17c Merge mysql.com:/home/jimw/my/mysql-5.0-17043 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-19 14:18:35 -07:00
evgen@moonbone.local
8b4eae6e4f func_gconcat.result: 
Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
 2006-04-20 00:27:43 +04:00
igor@rurik.mysql.com
950214abfc Fixed bug #19079. 
The bug caused a reported index corruption in the cases when
key_cache_block_size was not a multiple of myisam_block_size,
e.g. when key_cache_block_size=1536 while myisam_block_size=1024.
 2006-04-18 20:57:31 -07:00
cmiller@zippy.(none)
592dc88be7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-17 16:00:49 -04:00
cmiller@zippy.(none)
809cb7521c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-17 10:14:38 -04:00
gkodinov@mysql.com
94e556137d BUG#17152: Wrong result with BINARY comparison on aliased column 
Testsuite added
 2006-04-17 16:46:56 +03:00
bar@mysql.com
3fef2ba6aa Merge mysql.com:/usr/home/bar/mysql-4.1.b18691 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-04-17 15:01:55 +05:00
cmiller@zippy.(none)
7d282984f3 Only expand the empty string to the letters "NULL" if the column 
does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces.
 2006-04-16 17:17:36 -04:00
evgen@moonbone.local
bc1f457194 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14169-bug-4.1-mysql
 2006-04-14 17:25:58 +04:00
aelkin@mysql.com
b033da87fa Bug#19097: rpl_view failed on some platforms 
removing comments from the opt file.
 2006-04-14 12:13:26 +03:00
bell@sanja.is.com.ua
5c7955bd54 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-14 02:02:28 +03:00
konstantin@mysql.com
b5863b3987 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-14 02:38:41 +04:00
bell@sanja.is.com.ua
8136b25811 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-14 00:17:50 +03:00
bell@sanja.is.com.ua
efb8b990e4 The check for recursive view definitions added. (BUG#14308) 2006-04-13 23:12:26 +03:00
konstantin@mysql.com
6f51b4199f Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-14 00:07:04 +04:00
aelkin@dl145j.mysql.com
b6992dd4c5 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
 2006-04-13 20:55:51 +02:00
bell@sanja.is.com.ua
cb81389aef Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-13 15:07:50 +03:00
sergefp@mysql.com
34b2ed5f7f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.0-csc9139
 2006-04-13 16:07:48 +04:00
sergefp@mysql.com
1d3a0c0ec8 BUG#19021, Crash in ROR-index_merge optimizer: 
get_best_covering_ror_intersect() was copying ror_scans starting from the 
end of the array and not from its beginning.
 2006-04-13 16:05:32 +04:00
bar@mysql.com
45293fc346 Bug#18691: Converting number to UNICODE string returns invalid result. 
Conversion from int and real numbers to UCS2 didn't work fine: 
CONVERT(100, CHAR(50) UNICODE)
CONVERT(103.9, CHAR(50) UNICODE)

The problem appeared because numbers have binary charset, so,
simple charset recast binary->ucs2 was performed
instead of real conversion.

Fixed to make numbers pretend to be non-binary.
 2006-04-13 10:55:48 +05:00
igor@rurik.mysql.com
316eeff690 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-12 16:14:20 -07:00
konstantin@mysql.com
c49e6f8869 Post-merge fixes. Add a new error message for max_prepared_stmt_count 
limit.
 2006-04-13 01:46:44 +04:00
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
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
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
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
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
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)
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
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