diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-20 16:30:10 -0300 |
| commit | 6c15f6718f96cf2a712f1ea1ccf6e057ada5aa5f (patch) | |
| tree | c02d7fe89f0e9d9cbd05e83dd77ceeed812eb293 /include | |
| parent | 8d407c5f704c523205d52eabd89ca7fd366cf6eb (diff) | |
| parent | c96b249fc3912f7a86f885cc62da1a3eeed537c6 (diff) | |
| download | mariadb-git-6c15f6718f96cf2a712f1ea1ccf6e057ada5aa5f.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 5 | ||||
| -rw-r--r-- | include/mysys_err.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index e5ffa0db3bb..0c89a2ed384 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -255,14 +255,13 @@ int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */ we want to make sure that no such flags are set. */ #if defined(HAVE_SIGACTION) && !defined(my_sigset) -#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; int l_rc; \ +#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; \ DBUG_ASSERT((A) != 0); \ sigemptyset(&l_set); \ l_s.sa_handler = (B); \ l_s.sa_mask = l_set; \ l_s.sa_flags = 0; \ - l_rc= sigaction((A), &l_s, (struct sigaction *) NULL);\ - DBUG_ASSERT(l_rc == 0); \ + sigaction((A), &l_s, NULL); \ } while (0) #elif defined(HAVE_SIGSET) && !defined(my_sigset) #define my_sigset(A,B) sigset((A),(B)) diff --git a/include/mysys_err.h b/include/mysys_err.h index 9629dfec014..4067a3cfbd1 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -63,7 +63,9 @@ extern const char *globerrs[]; /* my_error_messages is here */ #define EE_UNKNOWN_COLLATION 28 #define EE_FILENOTFOUND 29 #define EE_FILE_NOT_CLOSED 30 -#define EE_ERROR_LAST 30 /* Copy last error nr */ +#define EE_CHANGE_OWNERSHIP 31 +#define EE_CHANGE_PERMISSIONS 32 +#define EE_ERROR_LAST 32 /* Copy last error nr */ /* Add error numbers before EE_ERROR_LAST and change it accordingly. */ /* exit codes for all MySQL programs */ |