database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fix error and warnings raised by gcc on Linux:

Browse Source 
Define O_RDONLY in jsonudf.cpp
 Correct wrong deinit function names
 Make Locate functions use the variable more
 Avoid signed/unsigned warning in ha_connect.cc GetIntegerTableOption
 Initialize oom in tabodbc MakeInsert
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabodbc.cpp
This commit is contained in:
Olivier Bertrand
2015-10-25 21:19:45 +01:00
parent de19721296 abe87bb011
commit e7fa7e0858
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/connect/ha_connect.cc
View File

@@ -1114,7 +1114,7 @@ int GetIntegerTableOption(PGLOBAL g, PTOS options, char *opname, int idef)
else if (!stricmp(opname, "Compressed")) else if (!stricmp(opname, "Compressed"))
opval= (options->compressed); opval= (options->compressed);
if (opval == (unsigned)NO_IVAL) { if (opval == (ulonglong)NO_IVAL) {
char *pv; char *pv;
if ((pv= GetListOption(g, opname, options->oplist))) if ((pv= GetListOption(g, opname, options->oplist)))

4
storage/connect/jsonudf.cpp
View File

@@ -19,11 +19,9 @@
#define _O_RDONLY O_RDONLY #define _O_RDONLY O_RDONLY
#endif #endif
#define MEMFIX 4096 #define MEMFIX 4096
#if defined(connect_EXPORTS) #if defined(connect_EXPORTS)
#define PUSH_WARNING(M) \ #define PUSH_WARNING(M) push_warning(current_thd, Sql_condition::WARN_LEVEL_WARN, 0, M)
push_warning(current_thd, Sql_condition::WARN_LEVEL_WARN, 0, M)
#else #else
#define PUSH_WARNING(M) htrc(M) #define PUSH_WARNING(M) htrc(M)
#endif #endif