diff options
| author | monty@mysql.com <> | 2005-10-06 17:54:43 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-06 17:54:43 +0300 |
| commit | 78e828d32f4c94a7135b7ddcf749ddc9e5bd0d3d (patch) | |
| tree | d92cfa6fa6040c06b41cafe2869f42c993c0ab2b /sql/table.cc | |
| parent | ff4a6e139e2a0b8d382dfadeff2cdc06b19c72a7 (diff) | |
| download | mariadb-git-78e828d32f4c94a7135b7ddcf749ddc9e5bd0d3d.tar.gz | |
Review of code pushed since last 5.0 pull:
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code
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 74ffe58e42e..6319afcd01b 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -287,7 +287,8 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, keynames=(char*) key_part; strpos+= (strmov(keynames, (char *) strpos) - keynames)+1; - share->null_bytes= null_pos - (uchar*) outparam->null_flags + (null_bit_pos + 7) / 8; + share->null_bytes= ((uint) (null_pos - (uchar*) outparam->null_flags) + + (null_bit_pos + 7) / 8); share->reclength = uint2korr((head+16)); if (*(head+26) == 1) |