diff options
| author | unknown <monty@mysql.com> | 2004-03-19 15:17:56 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-19 15:17:56 +0200 |
| commit | 67ea8aac5e9e9ae98a22aff063c48053ea68e5de (patch) | |
| tree | 788ab6bf4fc7ac236c7c862ab122f19dcdd83768 /innobase/que | |
| parent | d212d76094f83b1b7ce0692663439f3a67a432ad (diff) | |
| parent | 6b465557670093b038cb3d2be930e6a036292192 (diff) | |
| download | mariadb-git-67ea8aac5e9e9ae98a22aff063c48053ea68e5de.tar.gz | |
merge with 4.0 (to get compiler error fixes for innodb)
client/mysqltest.c:
Auto merged
include/errmsg.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/que/que0que.c:
Auto merged
mysql-test/t/rpl000009.test:
Auto merged
sql/set_var.cc:
Auto merged
libmysql/errmsg.c:
merge with 4.0
libmysql/libmysql.c:
merge with 4.0
mysql-test/mysql-test-run.sh:
merge with 4.0
mysql-test/r/rpl000009.result:
merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
merge with 4.0
sql/repl_failsafe.cc:
merge with 4.0
Diffstat (limited to 'innobase/que')
| -rw-r--r-- | innobase/que/que0que.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/innobase/que/que0que.c b/innobase/que/que0que.c index 77495246bb0..b2608b6d175 100644 --- a/innobase/que/que0que.c +++ b/innobase/que/que0que.c @@ -668,15 +668,15 @@ does nothing! */ void que_thr_handle_error( /*=================*/ - que_thr_t* thr __attribute((unused)), + que_thr_t* thr __attribute__((unused)), /* in: query thread */ - ulint err_no __attribute((unused)), + ulint err_no __attribute__((unused)), /* in: error number */ - byte* err_str __attribute((unused)), + byte* err_str __attribute__((unused)), /* in, own: error string or NULL; NOTE: the function will take care of freeing of the string! */ - ulint err_len __attribute((unused))) + ulint err_len __attribute__((unused))) /* in: error string length */ { /* Does nothing */ |