diff options
| author | unknown <sergefp@mysql.com> | 2004-05-29 20:55:46 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-05-29 20:55:46 +0400 |
| commit | b7130450950898892f14f2a1fef462ecac49e92a (patch) | |
| tree | 0107d5b2c95123b7a602a9f396d6aca05ce21a54 /sql/sql_select.h | |
| parent | b0921b1f5a1f610b04641a83d0d7b21e3fe46d84 (diff) | |
| parent | 2164db3c8c4c086dcc16d73baf7557a344d82129 (diff) | |
| download | mariadb-git-b7130450950898892f14f2a1fef462ecac49e92a.tar.gz | |
Manual merge
include/my_base.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/index_merge_innodb.result:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/opt_range.cc:
Hand merged
sql/opt_range.h:
Hand merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index b8a56fda757..b2864c166ce 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -339,7 +339,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 */ |