diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-11 20:45:48 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-11 20:45:48 +0200 |
| commit | 492a2bf569d98a5d38629f984b50080acb0edcd6 (patch) | |
| tree | 57c90c65e06cdd74de883d23793984c678538aa1 /sql | |
| parent | 7f7b04c5dbc146bcd822a55fb24e6a794345d107 (diff) | |
| download | mariadb-git-492a2bf569d98a5d38629f984b50080acb0edcd6.tar.gz | |
Fix for MyISAM records > 16M
Docs/manual.texi:
ChangeLog
innobase/os/os0file.c:
Removed compiler warnings
myisam/mi_check.c:
Fix for records > 16M
myisam/mi_dynrec.c:
Fix for records > 16M
myisam/myisamdef.h:
Fix for records > 16M
sql/sql_select.cc:
Cleanup
sql/sql_yacc.yy:
F
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 19 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index cfc40bdfdc3..c168ce775fc 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -480,7 +480,9 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, (thd->select_limit == HA_POS_ERROR || (join.select_options & OPTION_FOUND_ROWS) || order && - !(skip_sort_order=test_if_skip_sort_order(&join.join_tab[join.const_tables], order, thd->select_limit,1)))) + !(skip_sort_order= + test_if_skip_sort_order(&join.join_tab[join.const_tables], + order, thd->select_limit,1)))) { if ((group=create_distinct_group(order,fields))) { @@ -5272,13 +5274,6 @@ static uint find_shortest_key(TABLE *table, key_map usable_keys) } -/***************************************************************************** -** If not selecting by given key, create an index how records should be read -** return: 0 ok -** -1 some fatal error -** 1 no records -*****************************************************************************/ - /* Return 1 if we don't have to do file sorting */ static bool @@ -5391,6 +5386,14 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit, DBUG_RETURN(0); // Can't use index. } + +/***************************************************************************** + If not selecting by given key, create an index how records should be read + return: 0 ok + -1 some fatal error + 1 no records +*****************************************************************************/ + static int create_sort_index(JOIN_TAB *tab,ORDER *order,ha_rows select_limit) { diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ca8421aeaa2..a6b42cdf50b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1394,7 +1394,7 @@ select_lock_type: /* empty */ | FOR_SYM UPDATE_SYM { Lex->lock_option= TL_WRITE; current_thd->safe_to_cache_query=0; } - | IN_SYM SHARE_SYM MODE_SYM + | LOCK_SYM IN_SYM SHARE_SYM MODE_SYM { Lex->lock_option= TL_READ_WITH_SHARED_LOCKS; current_thd->safe_to_cache_query=0; } select_item_list: |