diff options
| author | jani@hynda.mysql.fi <> | 2007-11-26 11:27:01 +0200 |
|---|---|---|
| committer | jani@hynda.mysql.fi <> | 2007-11-26 11:27:01 +0200 |
| commit | 2e034c1e3b2473d045982758f7bfc5ba58c9225b (patch) | |
| tree | f6e52bbf6584ae0b2328b268ba417e4c88945e3e /sql/sql_select.cc | |
| parent | bf6cf069f151f7a5e2c4e8c66e568ef1240ff756 (diff) | |
| parent | d3a0ce08c739c721c3383ba9d36ceb7544e058e3 (diff) | |
| download | mariadb-git-2e034c1e3b2473d045982758f7bfc5ba58c9225b.tar.gz | |
Merge hynda.mysql.fi:/home/my/mysql-5.1-main
into hynda.mysql.fi:/home/my/mysql-5.1-marvel
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 60f004cda71..5cfa4d2ad08 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -29,6 +29,7 @@ #include "sql_cursor.h" #include <m_ctype.h> +#include <my_bit.h> #include <hash.h> #include <ft_global.h> @@ -9626,7 +9627,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, table->s= share; init_tmp_table_share(share, "", 0, tmpname, tmpname); share->blob_field= blob_field; - share->blob_ptr_size= mi_portable_sizeof_char_ptr; + share->blob_ptr_size= portable_sizeof_char_ptr; share->db_low_byte_first=1; // True for HEAP and MyISAM share->table_charset= param->table_charset; share->primary_key= MAX_KEY; // Indicate no primary key @@ -10191,7 +10192,7 @@ TABLE *create_virtual_tmp_table(THD *thd, List<Create_field> &field_list) table->s= share; share->blob_field= blob_field; share->fields= field_count; - share->blob_ptr_size= mi_portable_sizeof_char_ptr; + share->blob_ptr_size= portable_sizeof_char_ptr; setup_tmp_table_column_bitmaps(table, bitmaps); /* Create all fields and calculate the total length of record */ |