mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Build fix for sunfire100b. This can go when BUG#14420 is fixed.
dbug/dbug.c: Build fix for sunfire100b. The ld does not want to link with an empty library, so we put something in it. dbug/factorial.c: Build fix for sunfire100b. When DBUG_OFF is defined, dbug is not there, and we can't use it even if we try, period.
This commit is contained in:
14
dbug/dbug.c
14
dbug/dbug.c
@ -2375,4 +2375,18 @@ va_list ap;
|
|||||||
|
|
||||||
#endif /* NO_VARARGS */
|
#endif /* NO_VARARGS */
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Dummy function, workaround for MySQL bug#14420 related
|
||||||
|
* build failure on a platform where linking with an empty
|
||||||
|
* archive fails.
|
||||||
|
*
|
||||||
|
* This block can be removed as soon as a fix for bug#14420
|
||||||
|
* is implemented.
|
||||||
|
*/
|
||||||
|
int i_am_a_dummy_function() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
#ifdef DBUG_OFF /* We are testing dbug */
|
#ifdef DBUG_OFF /* We are testing dbug */
|
||||||
#undef DBUG_OFF
|
|
||||||
#endif
|
int factorial(register int value) {
|
||||||
|
if(value > 1) {
|
||||||
|
value *= factorial(value-1);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
#include <my_global.h>
|
#include <my_global.h>
|
||||||
|
|
||||||
@ -15,3 +22,6 @@ register int value)
|
|||||||
DBUG_PRINT ("result", ("result is %d", value));
|
DBUG_PRINT ("result", ("result is %d", value));
|
||||||
DBUG_RETURN (value);
|
DBUG_RETURN (value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user