diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-09-13 15:37:35 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-09-13 15:37:35 -0600 |
| commit | 5ffbb841bc0b95a1a2fcfa06199ee296cdf8248c (patch) | |
| tree | c6594a96f1dfc64d3662cde3c604ecbe39245554 /sql/log.h | |
| parent | ade595b0a01267e496fecbcb21192b1fe78b55f5 (diff) | |
| download | mariadb-git-5ffbb841bc0b95a1a2fcfa06199ee296cdf8248c.tar.gz | |
Post-merge fixes:
- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc
client/Makefile.am:
Post-merge fix
mysql-test/include/loaddata_autocom.inc:
Add dummy primary key to test table, because NDB doesn't like BLOB w/ no PK
mysql-test/r/loaddata_autocom_innodb.result:
Adapt test results to modified loaddata_autocom.inc
mysql-test/r/loaddata_autocom_ndb.result:
Adapt test results to modified loaddata_autocom.inc
server-tools/instance-manager/Makefile.am:
Post-merge fix
sql/log.h:
Post-merge fix
storage/innobase/Makefile.am:
Post-merge fix
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index 8f75601f02b..2b33f70392a 100644 --- a/sql/log.h +++ b/sql/log.h @@ -177,7 +177,7 @@ public: pthread_mutex_t LOCK_log; char *name; char log_file_name[FN_REFLEN]; - char time_buff[20], db[NAME_LEN + 1]; + char time_buff[20], db[NAME_BYTE_LEN + 1]; bool write_error, inited; IO_CACHE log_file; enum_log_type log_type; |