1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed key algorithm handling

Browse Source 
sql/sql_string.cc:
  Portability fix
This commit is contained in:
unknown 2002-05-22 20:09:03 +03:00
parent a8652e9957
commit e494b724d0
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@ -221,9 +221,6 @@ public:
List<key_part_spec> columns; List<key_part_spec> columns;
const char *Name; const char *Name;
Key(enum Keytype type_par,const char *name_arg,List<key_part_spec> &cols)
:type(type_par), columns(cols),Name(name_arg) {}
Key(enum Keytype type_par, enum ha_key_alg alg_par, const char *name_arg, List<key_part_spec> &cols) Key(enum Keytype type_par, enum ha_key_alg alg_par, const char *name_arg, List<key_part_spec> &cols)
:type(type_par), algorithm(alg_par), columns(cols), Name(name_arg) :type(type_par), algorithm(alg_par), columns(cols), Name(name_arg)
{} {}

5
sql/sql_parse.cc
View File

@ -2787,14 +2787,14 @@ bool add_field_to_list(char *field_name, enum_field_types type,
if (type_modifier & PRI_KEY_FLAG) if (type_modifier & PRI_KEY_FLAG)
{ {
lex->col_list.push_back(new key_part_spec(field_name,0)); lex->col_list.push_back(new key_part_spec(field_name,0));
lex->key_list.push_back(new Key(Key::PRIMARY,NullS, lex->key_list.push_back(new Key(Key::PRIMARY, HA_KEY_ALG_UNDEF, NullS,
lex->col_list)); lex->col_list));
lex->col_list.empty(); lex->col_list.empty();
} }
if (type_modifier & (UNIQUE_FLAG | UNIQUE_KEY_FLAG)) if (type_modifier & (UNIQUE_FLAG | UNIQUE_KEY_FLAG))
{ {
lex->col_list.push_back(new key_part_spec(field_name,0)); lex->col_list.push_back(new key_part_spec(field_name,0));
lex->key_list.push_back(new Key(Key::UNIQUE,NullS, lex->key_list.push_back(new Key(Key::UNIQUE, HA_KEY_ALG_UNDEF, NullS,
lex->col_list)); lex->col_list));
lex->col_list.empty(); lex->col_list.empty();
} }
@ -2858,6 +2858,7 @@ bool add_field_to_list(char *field_name, enum_field_types type,
case FIELD_TYPE_STRING: case FIELD_TYPE_STRING:
case FIELD_TYPE_VAR_STRING: case FIELD_TYPE_VAR_STRING:
case FIELD_TYPE_NULL: case FIELD_TYPE_NULL:
case FIELD_TYPE_GEOMETRY:
break; break;
case FIELD_TYPE_DECIMAL: case FIELD_TYPE_DECIMAL:
if (!length) if (!length)

4
sql/sql_string.cc
View File

@ -123,7 +123,7 @@ bool String::set(double num,uint decimals)
char *pos,*to; char *pos,*to;
VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1)); VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1));
if (!isdigit(buff[1])) if (!my_isdigit(system_charset_info, buff[1]))
{ // Nan or Inf { // Nan or Inf
pos=buff+1; pos=buff+1;
if (sign) if (sign)
@ -490,7 +490,7 @@ void String::qs_append(double d)
void String::qs_append(double *d) void String::qs_append(double *d)
{ {
double ld; double ld;
float8get(ld, d); float8get(ld, (char*) d);
qs_append(ld); qs_append(ld);
} }

5
sql/table.cc
View File

@ -199,7 +199,12 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
/* Read key types */ /* Read key types */
keyinfo=outparam->key_info; keyinfo=outparam->key_info;
for (i=0 ; i < keys ; i++, keyinfo++) for (i=0 ; i < keys ; i++, keyinfo++)
{
keyinfo->algorithm= (enum ha_key_alg) *(strpos++); keyinfo->algorithm= (enum ha_key_alg) *(strpos++);
/* Temporary fix to get spatial index to work */
if (keyinfo->algorithm == HA_KEY_ALG_RTREE)
keyinfo->flags|= HA_SPATIAL;
}
} }
else else
{ {