summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2004-12-16 16:16:28 +0300
committerkonstantin@mysql.com <>2004-12-16 16:16:28 +0300
commitba69a5b7e8e40f2fbedef88f18d4139887770fb6 (patch)
treec33ac0fd3ffccc3d018d7188dd144a17fd01ebce /sql
parent9c60cd3818117d6aa9d64948838a5ae8dbfa6a3f (diff)
downloadmariadb-git-ba69a5b7e8e40f2fbedef88f18d4139887770fb6.tar.gz
Making 4.1 tree compile with -ansi -pedantic
Diffstat (limited to 'sql')
-rw-r--r--sql/item_create.h2
-rw-r--r--sql/sql_cache.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_create.h b/sql/item_create.h
index 7577627ef04..faff6f45220 100644
--- a/sql/item_create.h
+++ b/sql/item_create.h
@@ -87,7 +87,7 @@ Item *create_func_soundex(Item* a);
Item *create_func_space(Item *);
Item *create_func_sqrt(Item* a);
Item *create_func_strcmp(Item* a, Item *b);
-Item *create_func_tan(Item* a);;
+Item *create_func_tan(Item* a);
Item *create_func_time_format(Item *a, Item *b);
Item *create_func_time_to_sec(Item* a);
Item *create_func_to_days(Item* a);
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 0e2058d73e9..bd42a2c1720 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -374,7 +374,7 @@ inline Query_cache_block * Query_cache_block_table::block()
return (Query_cache_block *)(((byte*)this) -
ALIGN_SIZE(sizeof(Query_cache_block_table)*n) -
ALIGN_SIZE(sizeof(Query_cache_block)));
-};
+}
/*****************************************************************************
Query_cache_block method(s)