summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2004-05-13 01:49:47 +0400
committersergefp@mysql.com <>2004-05-13 01:49:47 +0400
commit3b29cad05c71dc28692a051fb28085d5a5484d8e (patch)
treec476a92e4fdd992d29c2236102f35fd64e43857f /sql/sql_select.h
parent654bf99b94be51126424c7dce1bc07f1840aff83 (diff)
parenta46d7542c94eb5848231324a043ddccffbc552b0 (diff)
downloadmariadb-git-3b29cad05c71dc28692a051fb28085d5a5484d8e.tar.gz
Manual merge
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 0b75367ca55..48926c838e8 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -334,7 +334,7 @@ uint find_shortest_key(TABLE *table, const key_map *usable_keys);
int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds);
/* from sql_delete.cc, used by opt_range.cc */
-extern "C" int refposcmp2(void* arg, const void *a,const void *b);
+extern "C" int refpos_order_cmp(void* arg, const void *a,const void *b);
/* class to copying an field/item to a key struct */