/[packages]/cauldron/mariadb/current/SOURCES/mariadb-5.5-errno.patch
ViewVC logotype

Diff of /cauldron/mariadb/current/SOURCES/mariadb-5.5-errno.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 583354 by alien, Tue Sep 17 06:13:48 2013 UTC revision 583355 by oden, Wed Feb 5 14:19:22 2014 UTC
# Line 1  Line 1 
1  "extern int errno" is just a really bad idea.  "extern int errno" is just a really bad idea.
2    
3    
4  diff -Naur 5.5_orig/include/my_sys.h 5.5/include/my_sys.h  diff -Naurp mariadb-10.0.7/include/my_sys.h mariadb-10.0.7.oden/include/my_sys.h
5  --- 5.5_orig/include/my_sys.h   2011-12-16 17:21:58.651149000 +0100  --- mariadb-10.0.7/include/my_sys.h     2013-12-23 10:35:05.000000000 +0100
6  +++ 5.5/include/my_sys.h        2011-12-16 18:10:28.607900650 +0100  +++ mariadb-10.0.7.oden/include/my_sys.h        2014-02-04 16:34:36.392328175 +0100
7  @@ -198,13 +198,8 @@  @@ -209,13 +209,8 @@ extern void my_large_free(uchar *ptr);
8   #define my_safe_alloca(size, min_length) ((size <= min_length) ? my_alloca(size) : my_malloc(size,MYF(MY_FAE)))   #define my_safe_afree(ptr, size, max_alloca_sz) my_afree(ptr)
9   #define my_safe_afree(ptr, size, min_length) ((size <= min_length) ? my_afree(ptr) : my_free(ptr))   #endif /* HAVE_ALLOCA */
10    
11  -#ifndef errno                          /* did we already get it? */  -#ifndef errno                          /* did we already get it? */
12  -#ifdef HAVE_ERRNO_AS_DEFINE  -#ifdef HAVE_ERRNO_AS_DEFINE
# Line 19  diff -Naur 5.5_orig/include/my_sys.h 5.5 Line 19  diff -Naur 5.5_orig/include/my_sys.h 5.5
19   extern char *home_dir;                 /* Home directory for user */   extern char *home_dir;                 /* Home directory for user */
20   extern MYSQL_PLUGIN_IMPORT char  *mysql_data_home;   extern MYSQL_PLUGIN_IMPORT char  *mysql_data_home;
21   extern const char *my_progname;                /* program-name (printed in errors) */   extern const char *my_progname;                /* program-name (printed in errors) */
  extern const char *my_progname_short;  /* like above but without directory */  
Legend:
Removed from v.583354  
changed lines
  Added in v.583355
  ViewVC Help
Powered by ViewVC 1.1.30