summaryrefslogtreecommitdiff
path: root/sql/sql_analyse.cc
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-06-04 00:40:27 +0300
committerunknown <monty@hundin.mysql.fi>2002-06-04 00:40:27 +0300
commita7798dfd0a6472bf65fffc2ade543605e177ff9c (patch)
tree675836bfd2d520dcffdb4499ac8cf51045c407f2 /sql/sql_analyse.cc
parent7cb2e2d1dce2c7466388f4a6ade0614564be82fc (diff)
downloadmariadb-git-a7798dfd0a6472bf65fffc2ade543605e177ff9c.tar.gz
Enable LOAD DATA LOCAL INFILE in mysql_test
Added syntax for column comments (for compability with 4.1) Fix of ALTER TABLE RENAME Docs/manual.texi: Changelog client/mysqltest.c: Enable LOAD DATA LOCAL INFILE mysql-test/r/alter_table.result: Test of syntax for column comments mysql-test/r/func_math.result: Fixed test of new truncate mysql-test/t/alter_table.test: Test of syntax for column comments mysys/my_gethostbyname.c: Portability fix sql/hostname.cc: Fixed pointer bug sql/item_cmpfunc.cc: Optimizing LIKE code sql/item_cmpfunc.h: Cleanup sql/mysqld.cc: Avoid warning of duplicate calls to mysql_thread_init() sql/sql_analyse.cc: Removed warning from DBUG sql/sql_parse.cc: Avoid warning of duplicate calls to mysql_thread_init() sql/sql_table.cc: Fix of ALTER TABLE RENAME sql/sql_yacc.yy: Added syntax for field comments vio/test-sslserver.c: Cleanup
Diffstat (limited to 'sql/sql_analyse.cc')
-rw-r--r--sql/sql_analyse.cc27
1 files changed, 16 insertions, 11 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index df8a8f1fdde..bbe82653190 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -90,21 +90,21 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
(*param->item)->val() < 0)
{
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
- return 0;
+ DBUG_RETURN(0);
}
pc->max_tree_elements = (uint) (*param->item)->val_int();
param = param->next;
if (param->next) // no third parameter possible
{
net_printf(&thd->net, ER_WRONG_PARAMCOUNT_TO_PROCEDURE, proc_name);
- return 0;
+ DBUG_RETURN(0);
}
// second parameter
if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val() < 0)
{
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
- return 0;
+ DBUG_RETURN(0);
}
pc->max_treemem = (uint) (*param->item)->val_int();
}
@@ -112,7 +112,7 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
(*param->item)->val() < 0)
{
net_printf(&thd->net, ER_WRONG_PARAMETERS_TO_PROCEDURE, proc_name);
- return 0;
+ DBUG_RETURN(0);
}
// if only one parameter was given, it will be the value of max_tree_elements
else
@@ -148,21 +148,26 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
if (item->result_type() == STRING_RESULT)
*f_info++ = new field_str(item, pc);
}
- return pc;
-} // proc_analyse_init
+ DBUG_RETURN(pc);
+}
-// return 1 if number, else return 0
-// store info about found number in info
-// NOTE:It is expected, that elements of 'info' are all zero!
+/*
+ Return 1 if number, else return 0
+ store info about found number in info
+ NOTE:It is expected, that elements of 'info' are all zero!
+*/
+
bool test_if_number(NUM_INFO *info, const char *str, uint str_len)
{
const char *begin, *end = str + str_len;
DBUG_ENTER("test_if_number");
- // MySQL removes any endspaces of a string, so we must take care only of
- // spaces in front of a string
+ /*
+ MySQL removes any endspaces of a string, so we must take care only of
+ spaces in front of a string
+ */
for (; str != end && isspace(*str); str++) ;
if (str == end)
return 0;