mirror of
https://github.com/MariaDB/server.git
synced 2026-05-04 22:25:32 +02:00
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1 mysql-test/t/disabled.def: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/ha_ndbcluster_binlog.h: Auto merged sql/sql_show.cc: Auto merged
This commit is contained in:
commit
56c7e8b3c8
187 changed files with 11435 additions and 3584 deletions
|
|
@ -2925,7 +2925,7 @@ static int get_schema_tables_record(THD *thd, struct st_table_list *tables,
|
|||
ha_row_type[(uint) share->row_type],
|
||||
NullS);
|
||||
#ifdef WITH_PARTITION_STORAGE_ENGINE
|
||||
if (show_table->s->db_type == &partition_hton &&
|
||||
if (show_table->s->db_type == partition_hton &&
|
||||
show_table->part_info != NULL &&
|
||||
show_table->part_info->no_parts > 0)
|
||||
ptr= strmov(ptr, " partitioned");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue