diff options
| author | unknown <jimw@mysql.com> | 2005-11-30 13:51:23 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-30 13:51:23 -0800 |
| commit | 9c81773b37a5ec1a689632e3161ae6b9d1fdeb46 (patch) | |
| tree | b9c649237ea098d61c73d02638e8fbff45391d3f /sql/table.cc | |
| parent | 8486e64f3bced3c5cd2234587235bae970cd8a92 (diff) | |
| parent | b6547d09d637bf971a0e895da6af2bef67307a56 (diff) | |
| download | mariadb-git-9c81773b37a5ec1a689632e3161ae6b9d1fdeb46.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.1-release
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/t/alter_table.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/show_check.result:
Resolve conflict
sql/authors.h:
Resolve conflicts, update replication/backup developers
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1b0340a47fe..ff29a33ef03 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -57,7 +57,7 @@ static byte *get_field_name(Field **buff, uint *length, # Share */ -TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, byte *key, +TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key, uint key_length) { MEM_ROOT mem_root; @@ -1268,7 +1268,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, outparam->field= field_ptr; - record= (char*) outparam->record[0]-1; /* Fieldstart = 1 */ + record= (byte*) outparam->record[0]-1; /* Fieldstart = 1 */ if (share->null_field_first) outparam->null_flags= (uchar*) record+1; else |