mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Some minor fixes revealed as warnings by
Intel compiler.
This commit is contained in:

parent
acf218b708
commit
8d3036c35e
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include <my_global.h>
|
||||
#include <my_sys.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
#include <my_sys.h>
|
||||
#include <my_list.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include <my_global.h>
|
||||
#include "instance_options.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include <my_sys.h>
|
||||
#include <hash.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include "parse.h"
|
||||
#include "portability.h"
|
||||
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -50,7 +50,7 @@
|
||||
in manner, similar to ``quit'' signals.
|
||||
*/
|
||||
|
||||
#ifdef __GNUC__
|
||||
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
||||
#pragma interface
|
||||
#endif
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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() {};
|
||||
};
|
||||
|
||||
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user