mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- To avoid crashing in debug mode, the error message concerning the

Browse source 
making of the index is changed to a warning.

modified:
  storage/connect/ha_connect.cc
  storage/connect/tabmul.cpp*
This commit is contained in:
Olivier Bertrand 2013-06-12 20:48:55 +02:00
parent 36b7187663
commit a8428e3ac8
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
storage/connect/ha_connect.cc
View file

@ -2920,8 +2920,17 @@ int ha_connect::external_lock(THD *thd, int lock_type)
} // endelse Xchk
if (CloseTable(g))
if (CloseTable(g)) {
// This is an error while builing index
#if defined(_DEBUG)
// Make it a warning to avoid crash
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0, g->Message);
rc= 0;
#else // !_DEBUG
my_message(ER_UNKNOWN_ERROR, g->Message, MYF(0));
rc= HA_ERR_INTERNAL_ERROR;
#endif // !DEBUG
} // endif Close
DBUG_RETURN(rc);
} // endif MODE_ANY

8
storage/connect/tabmul.cpp Normal file → Executable file
View file

@ -125,15 +125,13 @@ PTDB TDBMUL::Duplicate(PGLOBAL g)
bool TDBMUL::InitFileNames(PGLOBAL g)
{
#define PFNZ 4096
char *pfn[PFNZ]/*, filename[_MAX_DRIVE+_MAX_DIR+_MAX_FNAME+_MAX_EXT]*/;
// char* *pfn;
char *filename;
int rc, n = 0;
char *pfn[PFNZ];
char *filename;
int rc, n = 0;
if (trace)
htrc("in InitFileName: fn[]=%d\n", _MAX_DRIVE+_MAX_DIR+_MAX_FNAME+_MAX_EXT);
// pfn = (char**)PlugSubAlloc(g, NULL, PFNZ * sizeof(char*));
filename = (char*)PlugSubAlloc(g, NULL, _MAX_DRIVE+_MAX_DIR+_MAX_FNAME+_MAX_EXT);
// The sub table may need to refer to the Table original block