diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-11 11:34:44 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-11 11:34:44 +0200 |
| commit | 6d4224a31c9d32c8f8067a4f7d16daa29bcdee6b (patch) | |
| tree | 79e3143528495069ad232f673532573b30afe425 /dbug | |
| parent | 3e2cb35e11cb5ee6668d538a62a3b32e017944a5 (diff) | |
| parent | 701c0f822abe4ee9eeafd244fa30dc2fcf067b81 (diff) | |
| download | mariadb-git-6d4224a31c9d32c8f8067a4f7d16daa29bcdee6b.tar.gz | |
Merge with 5.2.
no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/tests.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbug/tests.c b/dbug/tests.c index d76266d34a3..e1d416d6c43 100644 --- a/dbug/tests.c +++ b/dbug/tests.c @@ -16,7 +16,7 @@ const char *func3() void func2() { - const char *s; + const char *s __attribute__((unused)); DBUG_ENTER("func2"); s=func3(); DBUG_PRINT("info", ("s=%s", s)); |