Skip to content

M
MariaDB
Commit 9080d99c authored by unknown's avatar unknown
Browse files
Options

Some minor fixes revealed as warnings by 

Intel compiler.


client/mysqltest.c:
  Fixed a warning from using reference to a memory area,
  which is outside an object. This is just a minor
  clean-up, not a bug fix.
server-tools/instance-manager/buffer.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/buffer.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/command.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/command.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/guardian.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/guardian.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/instance.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/instance.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/instance_map.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/instance_map.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/instance_options.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/instance_options.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/listener.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/listener.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/mysql_connection.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/mysql_connection.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/options.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/options.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/parse_output.cc:
  Removed unused goto.
server-tools/instance-manager/thread_registry.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/thread_registry.h:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/user_map.cc:
  Fixed pragma warning for those compilers that do
  not support it.
server-tools/instance-manager/user_map.h:
  Fixed pragma warning for those compilers that do
  not support it.
sql/field.cc:
  Fixed a warning about overflow.
sql/item.h:
  Fixed implicit function declaration warning.
sql/item_sum.cc:
  Fixed implicit function declaration warning.
parent 83263892
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 25 deletions
client/mysqltest.c
View file @ 9080d99c
......@@ -549,7 +549,7 @@ static void close_cons()
static void close_files()
{
DBUG_ENTER("close_files");
for (; cur_file != (file_stack-1) ; cur_file--)
for (; cur_file >= file_stack; cur_file--)
{
DBUG_PRINT("info", ("file_name: %s", cur_file->file_name));
if (cur_file->file && cur_file->file != stdin)
......
server-tools/instance-manager/buffer.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/buffer.h
View file @ 9080d99c
......@@ -19,7 +19,7 @@
#include <my_global.h>
#include <my_sys.h>
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/command.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/command.h
View file @ 9080d99c
......@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/guardian.cc
View file @ 9080d99c
......@@ -15,7 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/guardian.h
View file @ 9080d99c
......@@ -22,7 +22,7 @@
#include <my_sys.h>
#include <my_list.h>
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/instance.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/instance.h
View file @ 9080d99c
......@@ -19,7 +19,7 @@
#include <my_global.h>
#include "instance_options.h"
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/instance_map.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/instance_map.h
View file @ 9080d99c
......@@ -24,7 +24,7 @@
#include <my_sys.h>
#include <hash.h>
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/instance_options.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/instance_options.h
View file @ 9080d99c
......@@ -21,7 +21,7 @@
#include "parse.h"
#include "portability.h"
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/listener.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/listener.h
View file @ 9080d99c
......@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/mysql_connection.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma interface
#endif
......
server-tools/instance-manager/mysql_connection.h
View file @ 9080d99c
......@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/options.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/options.h
View file @ 9080d99c
......@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/parse_output.cc
View file @ 9080d99c
......@@ -107,7 +107,6 @@ int parse_output_and_get_value(const char *command, const char *word,
}
}
pclose:
/* we are not interested in the termination status */
pclose(output);
......
server-tools/instance-manager/thread_registry.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma implementation
#endif
......
server-tools/instance-manager/thread_registry.h
View file @ 9080d99c
......@@ -50,7 +50,7 @@
in manner, similar to ``quit'' signals.
*/
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
server-tools/instance-manager/user_map.cc
View file @ 9080d99c
......@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
#pragma interface
#endif
......
server-tools/instance-manager/user_map.h
View file @ 9080d99c
......@@ -16,7 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#ifdef __GNUC__
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
#pragma interface
#endif
......
sql/field.cc
View file @ 9080d99c
......@@ -3438,7 +3438,7 @@ int Field_long::store(longlong nr, bool unsigned_val)
else
{
if (nr < 0 && unsigned_val)
nr= INT_MAX32+1; // Generate overflow
nr= ((longlong) INT_MAX32) + 1; // Generate overflow
if (nr < (longlong) INT_MIN32)
{
res=(int32) INT_MIN32;
......
sql/item.h
View file @ 9080d99c
......@@ -164,6 +164,7 @@ struct Hybrid_type_traits
virtual my_decimal *val_decimal(Hybrid_type *val, my_decimal *buf) const;
virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const;
static const Hybrid_type_traits *instance();
Hybrid_type_traits() {};
};
......@@ -185,6 +186,7 @@ struct Hybrid_type_traits_decimal: public Hybrid_type_traits
{ return &val->dec_buf[val->used_dec_buf_no]; }
virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const;
static const Hybrid_type_traits_decimal *instance();
Hybrid_type_traits_decimal() {};
};
......@@ -215,6 +217,7 @@ struct Hybrid_type_traits_integer: public Hybrid_type_traits
virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const
{ buf->set(val->integer, &my_charset_bin); return buf;}
static const Hybrid_type_traits_integer *instance();
Hybrid_type_traits_integer() {};
};
......
sql/item_sum.cc
View file @ 9080d99c
......@@ -545,6 +545,7 @@ struct Hybrid_type_traits_fast_decimal: public
val->traits->div(val, u);
}
static const Hybrid_type_traits_fast_decimal *instance();
Hybrid_type_traits_fast_decimal() {};
};
static const Hybrid_type_traits_fast_decimal fast_decimal_traits_instance;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7