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

Merge bk-internal:/home/bk/mysql-5.0

Browse Source 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
This commit is contained in:
serg@serg.mylan 2005-02-19 11:05:35 +01:00
commit cee85887df
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/examples/ha_tina.cc
View File

@ -647,7 +647,7 @@ int ha_tina::rnd_next(byte *buf)
In the case of an order by rows will need to be sorted. In the case of an order by rows will need to be sorted.
::position() is called after each call to ::rnd_next(), ::position() is called after each call to ::rnd_next(),
the data it stores is to a byte array. You can store this the data it stores is to a byte array. You can store this
data via ha_store_ptr(). ref_length is a variable defined to the data via my_store_ptr(). ref_length is a variable defined to the
class that is the sizeof() of position being stored. In our case class that is the sizeof() of position being stored. In our case
its just a position. Look at the bdb code if you want to see a case its just a position. Look at the bdb code if you want to see a case
where something other then a number is stored. where something other then a number is stored.
@ -655,14 +655,14 @@ int ha_tina::rnd_next(byte *buf)
void ha_tina::position(const byte *record) void ha_tina::position(const byte *record)
{ {
DBUG_ENTER("ha_tina::position"); DBUG_ENTER("ha_tina::position");
ha_store_ptr(ref, ref_length, current_position); my_store_ptr(ref, ref_length, current_position);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
/* /*
Used to fetch a row from a posiion stored with ::position(). Used to fetch a row from a posiion stored with ::position().
ha_get_ptr() retrieves the data for you. my_get_ptr() retrieves the data for you.
*/ */
int ha_tina::rnd_pos(byte * buf, byte *pos) int ha_tina::rnd_pos(byte * buf, byte *pos)
@ -670,7 +670,7 @@ int ha_tina::rnd_pos(byte * buf, byte *pos)
DBUG_ENTER("ha_tina::rnd_pos"); DBUG_ENTER("ha_tina::rnd_pos");
statistic_increment(table->in_use->status_var.ha_read_rnd_next_count, statistic_increment(table->in_use->status_var.ha_read_rnd_next_count,
&LOCK_status); &LOCK_status);
current_position= ha_get_ptr(pos,ref_length); current_position= my_get_ptr(pos,ref_length);
DBUG_RETURN(find_current_row(buf)); DBUG_RETURN(find_current_row(buf));
} }

10
sql/sql_yacc.yy
View File

@ -2798,7 +2798,7 @@ type:
Lex->uint_geom_type= (uint)$1; Lex->uint_geom_type= (uint)$1;
$$=FIELD_TYPE_GEOMETRY; $$=FIELD_TYPE_GEOMETRY;
#else #else
my_error(ER_FEATURE_DISABLED, MYF(0) my_error(ER_FEATURE_DISABLED, MYF(0),
sym_group_geom.name, sym_group_geom.needed_define); sym_group_geom.name, sym_group_geom.needed_define);
YYABORT; YYABORT;
#endif #endif
@ -3140,7 +3140,7 @@ opt_unique_or_fulltext:
#ifdef HAVE_SPATIAL #ifdef HAVE_SPATIAL
$$= Key::SPATIAL; $$= Key::SPATIAL;
#else #else
my_message(ER_FEATURE_DISABLED, ER(ER_FEATURE_DISABLED), MYF(0), my_error(ER_FEATURE_DISABLED, MYF(0),
sym_group_geom.name, sym_group_geom.needed_define); sym_group_geom.name, sym_group_geom.needed_define);
YYABORT; YYABORT;
#endif #endif
@ -4259,8 +4259,6 @@ simple_expr:
{ $$= new Item_func_concat(* $3); } { $$= new Item_func_concat(* $3); }
| CONCAT_WS '(' expr ',' expr_list ')' | CONCAT_WS '(' expr ',' expr_list ')'
{ $5->push_front($3); $$= new Item_func_concat_ws(*$5); } { $5->push_front($3); $$= new Item_func_concat_ws(*$5); }
| CONTAINS_SYM '(' expr ',' expr ')'
{ $$= create_func_contains($3, $5); }
| CONVERT_TZ_SYM '(' expr ',' expr ',' expr ')' | CONVERT_TZ_SYM '(' expr ',' expr ',' expr ')'
{ {
if (Lex->add_time_zone_tables_to_query_tables(YYTHD)) if (Lex->add_time_zone_tables_to_query_tables(YYTHD))
@ -4622,7 +4620,9 @@ simple_expr:
{ $$=new Item_extract( $3, $5); }; { $$=new Item_extract( $3, $5); };
geometry_function: geometry_function:
GEOMFROMTEXT '(' expr ')' CONTAINS_SYM '(' expr ',' expr ')'
{ $$= GEOM_NEW(Item_func_spatial_rel($3, $5, Item_func::SP_CONTAINS_FUNC)); }
| GEOMFROMTEXT '(' expr ')'
{ $$= GEOM_NEW(Item_func_geometry_from_text($3)); } { $$= GEOM_NEW(Item_func_geometry_from_text($3)); }
| GEOMFROMTEXT '(' expr ',' expr ')' | GEOMFROMTEXT '(' expr ',' expr ')'
{ $$= GEOM_NEW(Item_func_geometry_from_text($3, $5)); } { $$= GEOM_NEW(Item_func_geometry_from_text($3, $5)); }