diff options
| author | unknown <tim@work.mysql.com> | 2001-01-29 20:14:29 +0100 |
|---|---|---|
| committer | unknown <tim@work.mysql.com> | 2001-01-29 20:14:29 +0100 |
| commit | bf1f8fd3eb4b98dadd265f8ed10d92220dabe1bb (patch) | |
| tree | c871edb91cbcc25e8dc02efd481e5c826480a715 /sql/table.cc | |
| parent | ef2e14428542668c46d72fe8a4795df74ec4fedf (diff) | |
| parent | 74e9d984e7404e559a0fc8c5636b113edfb3cd97 (diff) | |
| download | mariadb-git-bf1f8fd3eb4b98dadd265f8ed10d92220dabe1bb.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/d1/users/tim/my/work
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 762c28b0fbf..8ee6ee02d68 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1033,6 +1033,7 @@ char *get_field(MEM_ROOT *mem, TABLE *table, uint fieldnr) bool check_db_name(const char *name) { + const char *start=end; while (*name) { #if defined(USE_MB) && defined(USE_MB_IDENT) @@ -1050,7 +1051,7 @@ bool check_db_name(const char *name) return 1; name++; } - return 0; + return (uint) (name - start) > NAME_LEN; } |