summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <ram@mysql.r18.ru>2003-06-20 14:31:47 +0500
committerunknown <ram@mysql.r18.ru>2003-06-20 14:31:47 +0500
commit2295fcc8769c4e7184cb012e3406f21b0d3a8d13 (patch)
tree3fa86ac795a79bea770a4e0910727bcfdd050dcb
parent84bf9b8adb0afafbaeb24f6e8dfc53d3820e8964 (diff)
downloadmariadb-git-2295fcc8769c4e7184cb012e3406f21b0d3a8d13.tar.gz
Added AsWKT() alias for AsText().
Renamed as_text(). sql/item_create.cc: Renamed as_text(). sql/item_create.h: Renamed as_text(). sql/lex.h: Added AsWKT() alias for AsText().
-rw-r--r--sql/item_create.cc2
-rw-r--r--sql/item_create.h2
-rw-r--r--sql/lex.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index eb442424ca8..908e74ac808 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -506,7 +506,7 @@ Item *create_func_quote(Item* a)
return new Item_func_quote(a);
}
-Item *create_func_as_text(Item *a)
+Item *create_func_as_wkt(Item *a)
{
return new Item_func_as_text(a);
}
diff --git a/sql/item_create.h b/sql/item_create.h
index b679c639244..4151f59a87f 100644
--- a/sql/item_create.h
+++ b/sql/item_create.h
@@ -104,7 +104,7 @@ Item *create_func_is_used_lock(Item* a);
Item *create_func_quote(Item* a);
Item *create_func_geometry_from_text(Item *a);
-Item *create_func_as_text(Item *a);
+Item *create_func_as_wkt(Item *a);
Item *create_func_as_wkb(Item *a);
Item *create_func_srid(Item *a);
Item *create_func_startpoint(Item *a);
diff --git a/sql/lex.h b/sql/lex.h
index f7c4418cb8d..bb6e7a81ab4 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -433,8 +433,9 @@ static SYMBOL sql_functions[] = {
{ "AREA", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_area)},
{ "ASIN", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_asin)},
{ "ASBINARY", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_as_wkb)},
- { "ASTEXT", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_as_text)},
+ { "ASTEXT", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_as_wkt)},
{ "ASWKB", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_as_wkb)},
+ { "ASWKT", SYM(FUNC_ARG1),0,CREATE_FUNC(create_func_as_wkt)},
{ "ATAN", SYM(ATAN),0,0},
{ "ATAN2", SYM(ATAN),0,0},
{ "BENCHMARK", SYM(BENCHMARK_SYM),0,0},