summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2014-04-24 18:20:57 +0300
committerMichael Widenius <monty@askmonty.org>2014-04-24 18:20:57 +0300
commitb17a053cc997adbf3f410aec4a6fab6739a8e15c (patch)
tree9b880d74dc711ab70bc8e856b78f00a03c995677 /.bzrignore
parent64d33032a6b780a345418ebcab2edd5fb68bfe0d (diff)
downloadmariadb-git-b17a053cc997adbf3f410aec4a6fab6739a8e15c.tar.gz
MDEV-6129: Server crashes during UNION with ORDER BY field IS NULL
Fixed crashing bug for union queries where there was no real tables. mysql-test/r/group_by.result: Added test case mysql-test/t/group_by.test: Added test case sql/db.opt: Removed genrated file sql/item.cc: Handled case when table_list->pos_in_tables is not set. Can only happens when there is no real tables in query
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index b373a7b8361..4142df6575f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1433,3 +1433,4 @@ storage/tokudb/ft-index/utils/tokudb_dump
storage/tokudb/ft-index/utils/tokudb_gen
storage/tokudb/ft-index/utils/tokudb_load
libmysql/libmysql_versions.ld
+scripts/mysql_config.pl