diff options
| author | unknown <serg@serg.mylan> | 2005-02-19 11:05:35 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-02-19 11:05:35 +0100 |
| commit | 47fd010f73d2c382bac4cc9054d8f9a3a459a241 (patch) | |
| tree | 1b584c0d4e9ef621798511204004d6001ed305f0 | |
| parent | a860439789048bb76a805d776d6cc777ff93a0e2 (diff) | |
| parent | a98179dcedd69a03554def1f9a018441efc15158 (diff) | |
| download | mariadb-git-47fd010f73d2c382bac4cc9054d8f9a3a459a241.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| -rw-r--r-- | sql/examples/ha_tina.cc | 8 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc index 46a22614566..b515932d25f 100644 --- a/sql/examples/ha_tina.cc +++ b/sql/examples/ha_tina.cc @@ -647,7 +647,7 @@ int ha_tina::rnd_next(byte *buf) In the case of an order by rows will need to be sorted. ::position() is called after each call to ::rnd_next(), 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 its just a position. Look at the bdb code if you want to see a case 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) { DBUG_ENTER("ha_tina::position"); - ha_store_ptr(ref, ref_length, current_position); + my_store_ptr(ref, ref_length, current_position); DBUG_VOID_RETURN; } /* 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) @@ -670,7 +670,7 @@ int ha_tina::rnd_pos(byte * buf, byte *pos) DBUG_ENTER("ha_tina::rnd_pos"); statistic_increment(table->in_use->status_var.ha_read_rnd_next_count, &LOCK_status); - current_position= ha_get_ptr(pos,ref_length); + current_position= my_get_ptr(pos,ref_length); DBUG_RETURN(find_current_row(buf)); } diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 5bc7f0e2bb9..04db57c5540 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2798,7 +2798,7 @@ type: Lex->uint_geom_type= (uint)$1; $$=FIELD_TYPE_GEOMETRY; #else - my_error(ER_FEATURE_DISABLED, MYF(0) + my_error(ER_FEATURE_DISABLED, MYF(0), sym_group_geom.name, sym_group_geom.needed_define); YYABORT; #endif @@ -3140,7 +3140,7 @@ opt_unique_or_fulltext: #ifdef HAVE_SPATIAL $$= Key::SPATIAL; #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); YYABORT; #endif @@ -4259,8 +4259,6 @@ simple_expr: { $$= new Item_func_concat(* $3); } | CONCAT_WS '(' expr ',' expr_list ')' { $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 ')' { if (Lex->add_time_zone_tables_to_query_tables(YYTHD)) @@ -4622,7 +4620,9 @@ simple_expr: { $$=new Item_extract( $3, $5); }; 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)); } | GEOMFROMTEXT '(' expr ',' expr ')' { $$= GEOM_NEW(Item_func_geometry_from_text($3, $5)); } |