summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2005-01-25 17:25:46 +0300
committerunknown <konstantin@mysql.com>2005-01-25 17:25:46 +0300
commitfec9018eff353a7811eed38d2ffc23e3652cbd7f (patch)
tree90d0a17ae84f98736dcd5dc809015b2a8c855387
parent892adb947e1f401e186289609c9b081712c9b331 (diff)
downloadmariadb-git-fec9018eff353a7811eed38d2ffc23e3652cbd7f.tar.gz
Fix two typos in comments.
sql/sql_parse.cc: Fix a comment. sql/sql_select.cc: Fix a comment.
-rw-r--r--sql/sql_parse.cc2
-rw-r--r--sql/sql_select.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 4bd6acce499..c0bcaf771a5 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5377,7 +5377,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
Initialize a new table list for a nested join
SYNOPSIS
- init_table_list()
+ init_nested_join()
thd current thread
DESCRIPTION
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d6e725341fe..dd1ac332df9 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12962,7 +12962,7 @@ static void print_join(THD *thd, String *str, List<TABLE_LIST> *tables)
{
TABLE_LIST *curr= *tbl;
if (curr->outer_join)
- str->append(" left join ", 11); // MySQL converg right to left joins
+ str->append(" left join ", 11); // MySQL converts right to left joins
else if (curr->straight)
str->append(" straight_join ", 15);
else