diff options
| author | unknown <mskold@mysql.com> | 2005-02-26 16:15:36 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-26 16:15:36 +0100 |
| commit | 7cc7a6285652ababf739953304b02cc7d0b92cda (patch) | |
| tree | f808846a5ff849df7616e3c21076d6367cf010b9 /sql/filesort.cc | |
| parent | 613d326a63e3aeb34b8b19406f1c1894654df73b (diff) | |
| parent | 8167f5e5ed35f1df7c2c32e126f0aa4e1d48c07a (diff) | |
| download | mariadb-git-7cc7a6285652ababf739953304b02cc7d0b92cda.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 14cac5b01db..7dd755308f1 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -769,7 +769,7 @@ static void make_sortkey(register SORTPARAM *param, */ SORT_ADDON_FIELD *addonf= param->addon_field; uchar *nulls= to; - DBUG_ASSERT(addonf); + DBUG_ASSERT(addonf != 0); bzero((char *) nulls, addonf->offset); to+= addonf->offset; for ( ; (field= addonf->field) ; addonf++) |