diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-06-17 15:34:39 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-06-17 15:34:39 +0300 |
| commit | 9ebda8764d2e94096924c0a0181f5773d836114a (patch) | |
| tree | 30b2fa62dd8b15f7cca809a59f2d8399584bea41 /extra/perror.c | |
| parent | 82942260972de9a7416064c177c3bce3512a984a (diff) | |
| download | mariadb-git-9ebda8764d2e94096924c0a0181f5773d836114a.tar.gz | |
Fixes after Serg's review of %M extenstions
- Changed output to be error "error-text" instead of error - error-text
extra/perror.c:
Move my_handler_errors.h into include
include/my_handler_errors.h:
Move my_handler_errors.h into include
mysql-test/r/errors.result:
Updated result
mysql-test/r/innodb_mysql_sync.result:
Updated result
mysql-test/r/myisam-system.result:
Updated result
mysql-test/r/myisampack.result:
Updated result
mysql-test/r/partition_innodb_plugin.result:
Updated result
mysql-test/r/ps_1general.result:
Updated result
mysql-test/r/trigger.result:
Updated result
mysql-test/r/type_bit.result:
Updated result
mysql-test/r/type_bit_innodb.result:
Updated result
mysql-test/r/type_blob.result:
Updated result
mysql-test/suite/archive/archive.result:
Updated result
mysql-test/suite/binlog/r/binlog_index.result:
Updated result
mysql-test/suite/binlog/r/binlog_ioerr.result:
Updated result
mysql-test/suite/csv/csv.result:
Updated result
mysql-test/suite/engines/iuds/r/type_bit_iuds.result:
Updated result
mysql-test/suite/federated/federated_bug_35333.result:
Updated result
mysql-test/suite/innodb/r/innodb-create-options.result:
Updated result
mysql-test/suite/innodb/r/innodb-index.result:
Updated result
mysql-test/suite/innodb/r/innodb-zip.result:
Updated result
mysql-test/suite/innodb/r/innodb.result:
Updated result
mysql-test/suite/innodb/r/innodb_bug13635833.result:
Updated result
mysql-test/suite/innodb/r/innodb_bug21704.result:
Updated result
mysql-test/suite/innodb/r/innodb_bug46000.result:
Updated result
mysql-test/suite/parts/r/partition_bit_innodb.result:
Updated result
mysql-test/suite/parts/r/partition_bit_myisam.result:
Updated result
mysql-test/suite/percona/percona_innodb_fake_changes.result:
Updated result
mysql-test/suite/perfschema/r/misc.result:
Updated result
mysql-test/suite/perfschema/r/privilege.result:
Updated result
mysql-test/suite/rpl/r/rpl_EE_err.result:
Updated result
mysql-test/suite/rpl/r/rpl_binlog_errors.result:
Updated result
mysql-test/suite/rpl/r/rpl_drop_db.result:
Updated result
sql/share/errmsg-utf8.txt:
Removed 'column' from error text that was used in different context
strings/my_vsnprintf.c:
Move my_handler_errors.h into include
Minor cleanups
Changed output of %M to be error "error-text" instead of error - error-text
unittest/mysys/my_vsnprintf-t.c:
Updated error text
Diffstat (limited to 'extra/perror.c')
| -rw-r--r-- | extra/perror.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extra/perror.c b/extra/perror.c index c8ea85c5504..a3104b6ddf0 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -31,9 +31,8 @@ static my_bool verbose, print_all_codes; -#include "../include/my_base.h" -#include "../mysys/my_handler_errors.h" -// #include "../include/my_compare.h" +#include <my_base.h> +#include <my_handler_errors.h> #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE static my_bool ndb_code; |