database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge xiphis.org:/home/antony/work2/mysql-5.1-engines

Browse Source 
into  xiphis.org:/home/antony/work2/mysql-5.1-engines-merge


include/mysql.h:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged
configure.in:
  fix merge conflict
This commit is contained in:
unknown
2006-12-26 12:33:21 -08:00
parent 4dabfa5de7 901cbf0326
commit fcbfb41f30
21 changed files with 648 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage/myisam/mi_range.c
View File

@@ -170,6 +170,7 @@ static double _mi_search_pos(register MI_INFO *info,
uchar *keypos,*buff;
double offset;
DBUG_ENTER("_mi_search_pos");
LINT_INIT(max_keynr);
if (pos == HA_OFFSET_ERROR)
DBUG_RETURN(0.5);