diff options
| author | unknown <gluh@mysql.com> | 2006-07-03 13:19:18 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com> | 2006-07-03 13:19:18 +0500 |
| commit | 3e085bd882a7283d43423c82d412ce276ff4ddcb (patch) | |
| tree | 92f15fb2e6a466fe825bb95eacd1187eeef200bb /sql/table.cc | |
| parent | 4c2db1bef100a1159f65d3fad0ec764727198e58 (diff) | |
| parent | 8703b22e167c706d5a8c77a1e24948b4db3fafb3 (diff) | |
| download | mariadb-git-3e085bd882a7283d43423c82d412ce276ff4ddcb.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index cfdb9bd93aa..83711577699 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -410,7 +410,9 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, int_length= uint2korr(head+274); share->null_fields= uint2korr(head+282); com_length= uint2korr(head+284); - share->comment= strdup_root(&outparam->mem_root, (char*) head+47); + share->comment.length= (int) (head[46]); + share->comment.str= strmake_root(&outparam->mem_root, (char*) head+47, + share->comment.length); DBUG_PRINT("info",("i_count: %d i_parts: %d index: %d n_length: %d int_length: %d com_length: %d", interval_count,interval_parts, share->keys,n_length,int_length, com_length)); |