mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Merge work:/my/mysql into donna.mysql.com:/home/my/mysql-new
Docs/manual.texi: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
This commit is contained in:
commit
6ffa174327
3 changed files with 7 additions and 1 deletions
|
|
@ -14,3 +14,4 @@ tim@threads.polyesthetic.msg
|
|||
tim@work.mysql.com
|
||||
yfaktoro@nbyfaktoro.bedford.progress.com
|
||||
yfaktoro@nslinuxw2.bedford.progress.com
|
||||
sasha@donna.mysql.com
|
||||
|
|
|
|||
|
|
@ -39228,6 +39228,9 @@ though, so Version 3.23 is not released as a stable version yet.
|
|||
@appendixsubsec Changes in release 3.23.29
|
||||
@itemize @bullet
|
||||
@item
|
||||
Fixed bug when doing a @code{SELECT DISTINCT ... table1 LEFT JOIN
|
||||
table2..] when table2 was empty.
|
||||
@item
|
||||
Added @code{--abort-slave-event-count} and
|
||||
@code{--disconnect-slave-event-count} options to @code{mysqld} for
|
||||
debugging and testing of replication
|
||||
|
|
|
|||
|
|
@ -5218,8 +5218,10 @@ remove_duplicates(JOIN *join, TABLE *entry,List<Item> &fields)
|
|||
List_iterator<Item> it(fields);
|
||||
Item *item;
|
||||
while ((item=it++))
|
||||
if (item->tmp_table_field())
|
||||
{
|
||||
if (item->tmp_table_field() && ! item->const_item())
|
||||
field_count++;
|
||||
}
|
||||
|
||||
if (!field_count)
|
||||
{ // only const items
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue