diff options
| author | unknown <baker@bk-internal.mysql.com> | 2006-09-16 07:19:42 +0200 |
|---|---|---|
| committer | unknown <baker@bk-internal.mysql.com> | 2006-09-16 07:19:42 +0200 |
| commit | 949e6681b4a94d6b9b66ceac250d8083bb28579e (patch) | |
| tree | 71a0711ebd5e76bbe03d69262db618c0fb8104a8 /sql/sql_insert.cc | |
| parent | 55d66b090219af0c013c9dc1a0cdee4b2f91e493 (diff) | |
| parent | 89cdb94ab8db9bc3120833b1547350c2ed0cb83c (diff) | |
| download | mariadb-git-949e6681b4a94d6b9b66ceac250d8083bb28579e.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
sql/mysqld.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index d561fb19953..ce237899b3a 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2767,8 +2767,8 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, tmp_table.s->db_create_options=0; tmp_table.s->blob_ptr_size= portable_sizeof_char_ptr; tmp_table.s->db_low_byte_first= - test(create_info->db_type == &myisam_hton || - create_info->db_type == &heap_hton); + test(create_info->db_type == myisam_hton || + create_info->db_type == heap_hton); tmp_table.null_row=tmp_table.maybe_null=0; while ((item=it++)) |