mirror of
https://github.com/MariaDB/server.git
synced 2025-11-21 06:21:35 +03:00
- Added braces around expressions with &&, ||, & and |
- Added empty line before ; for empty while and for loops
- Added () around if with assignments
- Removed const before function returning simple type
Changed BUILD scripts to not build with NDB
BUILD/SETUP.sh:
By default, don't build ndb with --max in Maria tree.
NDB is not kept up to date anyway in 5.1
client/mysql.cc:
Added braces around && to get rid of compiler warnings
sql/event_db_repository.cc:
Added braces around && to get rid of compiler warnings
sql/events.cc:
Added braces around && to get rid of compiler warnings
sql/field.cc:
Added braces around && to get rid of compiler warnings
Fixed for loops
sql/field.h:
Added braces around & to get rid of compiler warnings
sql/field_conv.cc:
Added braces around && to get rid of compiler warnings
Fixed bug when copying between DATETIME fields and strict dates are used
Removed not needeed else
sql/gstream.cc:
Added braces around && to get rid of compiler warnings
sql/ha_ndbcluster.cc:
Added braces around && to get rid of compiler warnings
Added {} to get rid of compiler warnings
sql/handler.cc:
Added braces around && to get rid of compiler warnings
sql/item.cc:
Added braces around && to get rid of compiler warnings
sql/item_cmpfunc.cc:
Added braces around && to get rid of compiler warnings
Removed some not needed space
sql/item_func.cc:
Added braces around && to get rid of compiler warnings
sql/item_strfunc.cc:
Added braces around && to get rid of compiler warnings
sql/item_subselect.cc:
Added braces around && to get rid of compiler warnings
sql/item_sum.cc:
Added braces around && to get rid of compiler warnings
sql/item_timefunc.cc:
Added braces around && to get rid of compiler warnings
sql/item_xmlfunc.cc:
Added empty line before ; for empty while and for loops
sql/log.cc:
Added braces around && to get rid of compiler warnings
sql/log_event.cc:
Added braces around && to get rid of compiler warnings
Removed not needed else
sql/log_event_old.cc:
Added braces around && to get rid of compiler warnings
sql/opt_range.cc:
Added braces around && to get rid of compiler warnings
sql/opt_sum.cc:
Added braces around && to get rid of compiler warnings
sql/set_var.cc:
Added empty line before ; for empty while and for loops
Added () around if with assignments
sql/slave.cc:
Added braces around && to get rid of compiler warnings
Added empty line before ; for empty while and for loops
sql/spatial.h:
Added braces around && to get rid of compiler warnings
sql/sql_acl.cc:
Added braces around && to get rid of compiler warnings
sql/sql_analyse.cc:
Added empty line before ; for empty while and for loops
sql/sql_base.cc:
Added braces around && to get rid of compiler warnings
sql/sql_connect.cc:
Added braces around && to get rid of compiler warnings
sql/sql_db.cc:
Added braces around && to get rid of compiler warnings
sql/sql_delete.cc:
Added braces around && to get rid of compiler warnings
sql/sql_help.cc:
Added empty line before ; for empty while and for loops
sql/sql_insert.cc:
Added braces around && to get rid of compiler warnings
Added () around if with assignments
sql/sql_lex.cc:
Cast char array references to uchar; Fixed wrong array referencing when using characters > ASCII 128 in SQL statments
Added empty line before ; for empty while and for loops
Trivial indent fixes
Added braces around && to get rid of compiler warnings
sql/sql_load.cc:
Added braces around && to get rid of compiler warnings
sql/sql_parse.cc:
Added braces around && to get rid of compiler warnings
sql/sql_partition.cc:
Added braces around && to get rid of compiler warnings
sql/sql_plugin.cc:
Fixed bug in detecing if option variable should be readonly
Added empty line before ; for empty while and for loops
sql/sql_prepare.cc:
Added braces around && to get rid of compiler warnings
sql/sql_select.cc:
Added braces around && to get rid of compiler warnings
Added () around if with assignments
Added empty line before ; for empty while and for loops
sql/sql_show.cc:
Added braces around && to get rid of compiler warnings
sql/sql_table.cc:
Added braces around && to get rid of compiler warnings
sql/sql_trigger.cc:
Added braces around && to get rid of compiler warnings
sql/sql_update.cc:
Added braces around && to get rid of compiler warnings
sql/sql_yacc.yy:
Added braces around && to get rid of compiler warnings
sql/table.cc:
Added braces around && to get rid of compiler warnings
sql/table.h:
Added braces around && to get rid of compiler warnings
sql/time.cc:
Added braces around && to get rid of compiler warnings
sql/tztime.cc:
Added braces around && to get rid of compiler warnings
sql/uniques.cc:
Added braces around && to get rid of compiler warnings
storage/federated/ha_federated.cc:
Fixed bug in testing of variable to ha_info() (Not critical)
storage/heap/ha_heap.cc:
Added braces around && to get rid of compiler warnings
storage/maria/ha_maria.cc:
Fixed bug: Mark that maria_log_dir_path is readonly
Added braces around && to get rid of compiler warnings
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
Removed const before function returning simple type
storage/ndb/include/ndbapi/NdbOperation.hpp:
Removed const before function returning simple type
storage/ndb/src/ndbapi/Ndb.cpp:
Added empty line before ; for empty while and for loops
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
Removed const before function returning simple type
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Removed const before function returning simple type
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
Removed const before function returning simple type
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Added empty line before ; for empty while and for loops
storage/ndb/src/ndbapi/TransporterFacade.hpp:
Added braces around && to get rid of compiler warnings
120 lines
2.8 KiB
C++
120 lines
2.8 KiB
C++
/* Copyright (C) 2004 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Functions to read and parse geometrical data.
|
|
NOTE: These functions assumes that the string is end \0 terminated!
|
|
*/
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
enum Gis_read_stream::enum_tok_types Gis_read_stream::get_next_toc_type()
|
|
{
|
|
skip_space();
|
|
if (m_cur >= m_limit)
|
|
return eostream;
|
|
if (my_isvar_start(&my_charset_bin, *m_cur))
|
|
return word;
|
|
if ((*m_cur >= '0' && *m_cur <= '9') || *m_cur == '-' || *m_cur == '+')
|
|
return numeric;
|
|
if (*m_cur == '(')
|
|
return l_bra;
|
|
if (*m_cur == ')')
|
|
return r_bra;
|
|
if (*m_cur == ',')
|
|
return comma;
|
|
return unknown;
|
|
}
|
|
|
|
|
|
bool Gis_read_stream::get_next_word(LEX_STRING *res)
|
|
{
|
|
skip_space();
|
|
res->str= (char*) m_cur;
|
|
/* The following will also test for \0 */
|
|
if ((m_cur >= m_limit) || !my_isvar_start(&my_charset_bin, *m_cur))
|
|
return 1;
|
|
|
|
/*
|
|
We can't combine the following increment with my_isvar() because
|
|
my_isvar() is a macro that would cause side effects
|
|
*/
|
|
m_cur++;
|
|
while ((m_cur < m_limit) && my_isvar(&my_charset_bin, *m_cur))
|
|
m_cur++;
|
|
|
|
res->length= (uint32) (m_cur - res->str);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Read a floating point number
|
|
|
|
NOTE: Number must start with a digit or sign. It can't start with a decimal
|
|
point
|
|
*/
|
|
|
|
bool Gis_read_stream::get_next_number(double *d)
|
|
{
|
|
char *endptr;
|
|
int err;
|
|
|
|
skip_space();
|
|
|
|
if ((m_cur >= m_limit) ||
|
|
((*m_cur < '0' || *m_cur > '9') && *m_cur != '-' && *m_cur != '+'))
|
|
{
|
|
set_error_msg("Numeric constant expected");
|
|
return 1;
|
|
}
|
|
|
|
*d = my_strntod(m_charset, (char *)m_cur,
|
|
(uint) (m_limit-m_cur), &endptr, &err);
|
|
if (err)
|
|
return 1;
|
|
if (endptr)
|
|
m_cur = endptr;
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool Gis_read_stream::check_next_symbol(char symbol)
|
|
{
|
|
skip_space();
|
|
if ((m_cur >= m_limit) || (*m_cur != symbol))
|
|
{
|
|
char buff[32];
|
|
strmov(buff, "'?' expected");
|
|
buff[2]= symbol;
|
|
set_error_msg(buff);
|
|
return 1;
|
|
}
|
|
m_cur++;
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Remember error message.
|
|
*/
|
|
|
|
void Gis_read_stream::set_error_msg(const char *msg)
|
|
{
|
|
size_t len= strlen(msg); // ok in this context
|
|
m_err_msg= (char *) my_realloc(m_err_msg, (uint) len + 1, MYF(MY_ALLOW_ZERO_PTR));
|
|
memcpy(m_err_msg, msg, len + 1);
|
|
}
|