summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/item_strfunc.cc3
-rw-r--r--sql/lex.h2
-rw-r--r--sql/net_serv.cc3
-rw-r--r--sql/sql_class.cc12
-rw-r--r--sql/sql_table.cc6
-rw-r--r--sql/sql_yacc.yy20
-rw-r--r--sql/udf_example.c2
7 files changed, 22 insertions, 26 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 0cc0cc3c84d..acc522b1b46 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -25,9 +25,6 @@
#include "mysql_priv.h"
#include <m_ctype.h>
-#ifdef HAVE_OPENSSL
-#include <openssl/des.h>
-#endif /* HAVE_OPENSSL */
#include "md5.h"
#include "sha1.h"
#include "my_aes.h"
diff --git a/sql/lex.h b/sql/lex.h
index 2bf0e08c825..45155da7692 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -222,7 +222,7 @@ static SYMBOL symbols[] = {
{ "GLOBAL", SYM(GLOBAL_SYM)},
{ "GRANT", SYM(GRANT)},
{ "GRANTS", SYM(GRANTS)},
- { "GROUP", SYM(GROUP)},
+ { "GROUP", SYM(GROUP_SYM)},
{ "HANDLER", SYM(HANDLER_SYM)},
{ "HASH", SYM(HASH_SYM)},
{ "HAVING", SYM(HAVING)},
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index e9533495650..2156888b8cf 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -47,9 +47,6 @@
#include <violite.h>
#include <signal.h>
#include <errno.h>
-#ifdef __WIN__
-#include <winsock.h>
-#endif
#ifdef __NETWARE__
#include <sys/select.h>
#endif
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 53500e3f661..039fd71d670 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -2554,7 +2554,7 @@ namespace {
: m_memory(0)
{
#ifndef DBUG_OFF
- m_alloc_checked= false;
+ m_alloc_checked= FALSE;
#endif
allocate_memory(table, len1);
m_ptr[0]= has_memory() ? m_memory : 0;
@@ -2565,7 +2565,7 @@ namespace {
: m_memory(0)
{
#ifndef DBUG_OFF
- m_alloc_checked= false;
+ m_alloc_checked= FALSE;
#endif
allocate_memory(table, len1 + len2);
m_ptr[0]= has_memory() ? m_memory : 0;
@@ -2586,7 +2586,7 @@ namespace {
*/
bool has_memory() const {
#ifndef DBUG_OFF
- m_alloc_checked= true;
+ m_alloc_checked= TRUE;
#endif
return m_memory != 0;
}
@@ -2595,7 +2595,7 @@ namespace {
{
DBUG_ASSERT(s < sizeof(m_ptr)/sizeof(*m_ptr));
DBUG_ASSERT(m_ptr[s] != 0);
- DBUG_ASSERT(m_alloc_checked == true);
+ DBUG_ASSERT(m_alloc_checked == TRUE);
return m_ptr[s];
}
@@ -2625,12 +2625,12 @@ namespace {
table->write_row_record=
(byte *) alloc_root(&table->mem_root, 2 * maxlen);
m_memory= table->write_row_record;
- m_release_memory_on_destruction= false;
+ m_release_memory_on_destruction= FALSE;
}
else
{
m_memory= (byte *) my_malloc(total_length, MYF(MY_WME));
- m_release_memory_on_destruction= true;
+ m_release_memory_on_destruction= TRUE;
}
}
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 9162e160bff..36f0acd8f67 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4597,7 +4597,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
Table_ident *table_ident)
{
TABLE *tmp_table;
- char src_path[FN_REFLEN], dst_path[FN_REFLEN], tmp_path[FN_REFLEN];
+ char src_path[FN_REFLEN], dst_path[FN_REFLEN];
char src_table_name_buff[FN_REFLEN], src_db_name_buff[FN_REFLEN];
uint dst_path_length;
char *db= table->db;
@@ -4608,7 +4608,9 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table,
bool res= TRUE, unlock_dst_table= FALSE;
enum legacy_db_type not_used;
HA_CREATE_INFO *create_info;
-
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+ char tmp_path[FN_REFLEN];
+#endif
TABLE_LIST src_tables_list, dst_tables_list;
DBUG_ENTER("mysql_create_like_table");
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index aa386dcf09c..9c062407921 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -556,7 +556,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%token GLOBAL_SYM /* SQL-2003-R */
%token GRANT /* SQL-2003-R */
%token GRANTS
-%token GROUP /* SQL-2003-R */
+%token GROUP_SYM /* SQL-2003-R */
%token GROUP_CONCAT_SYM
%token GT_SYM /* OPERATOR */
%token HANDLER_SYM
@@ -1505,7 +1505,7 @@ create:
{
Lex->sql_command = SQLCOM_CREATE_USER;
}
- | CREATE LOGFILE_SYM GROUP logfile_group_info
+ | CREATE LOGFILE_SYM GROUP_SYM logfile_group_info
{
Lex->alter_tablespace_info->ts_cmd_type= CREATE_LOGFILE_GROUP;
}
@@ -3081,11 +3081,11 @@ trg_event:
ALTER TABLESPACE name CHANGE DATAFILE ...
ALTER TABLESPACE name ADD DATAFILE ...
ALTER TABLESPACE name access_mode
- CREATE LOGFILE GROUP name ...
- ALTER LOGFILE GROUP name ADD UNDOFILE ..
- ALTER LOGFILE GROUP name ADD REDOFILE ..
+ CREATE LOGFILE GROUP_SYM name ...
+ ALTER LOGFILE GROUP_SYM name ADD UNDOFILE ..
+ ALTER LOGFILE GROUP_SYM name ADD REDOFILE ..
DROP TABLESPACE name
- DROP LOGFILE GROUP name
+ DROP LOGFILE GROUP_SYM name
*/
change_tablespace_access:
tablespace_name
@@ -3107,7 +3107,7 @@ tablespace_info:
opt_logfile_group_name:
/* empty */ {}
- | USE_SYM LOGFILE_SYM GROUP ident
+ | USE_SYM LOGFILE_SYM GROUP_SYM ident
{
LEX *lex= Lex;
lex->alter_tablespace_info->logfile_group_name= $4.str;
@@ -5073,7 +5073,7 @@ alter:
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= ALTER_TABLESPACE;
}
- | ALTER LOGFILE_SYM GROUP alter_logfile_group_info
+ | ALTER LOGFILE_SYM GROUP_SYM alter_logfile_group_info
{
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= ALTER_LOGFILE_GROUP;
@@ -7552,7 +7552,7 @@ opt_escape:
group_clause:
/* empty */
- | GROUP BY group_list olap_opt;
+ | GROUP_SYM BY group_list olap_opt;
group_list:
group_list ',' order_ident order_dir
@@ -8016,7 +8016,7 @@ drop:
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= DROP_TABLESPACE;
}
- | DROP LOGFILE_SYM GROUP logfile_group_name opt_ts_engine opt_ts_wait
+ | DROP LOGFILE_SYM GROUP_SYM logfile_group_name opt_ts_engine opt_ts_wait
{
LEX *lex= Lex;
lex->alter_tablespace_info->ts_cmd_type= DROP_LOGFILE_GROUP;
diff --git a/sql/udf_example.c b/sql/udf_example.c
index 2bb4fe92d2f..d37c6505ced 100644
--- a/sql/udf_example.c
+++ b/sql/udf_example.c
@@ -684,7 +684,7 @@ longlong sequence(UDF_INIT *initid __attribute__((unused)), UDF_ARGS *args,
****************************************************************************/
#ifdef __WIN__
-#include <winsock.h>
+#include <winsock2.h>
#else
#include <sys/socket.h>
#include <netinet/in.h>
View Lorry Controller Status