database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into  mysql.com:/home/my/mysql-5.1


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
This commit is contained in:
unknown
2006-03-29 17:28:40 +03:00
parent b002c11756 8ac1d55286
commit 9f6cf5b6cc
59 changed files with 287 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_partition.cc
View File

@@ -4921,7 +4921,7 @@ the generated partition syntax in a correct manner.
*/
if (table->part_info)
{
if (thd->lex->alter_info.flags & ALTER_REMOVE_PARTITIONING)
if (alter_info->flags & ALTER_REMOVE_PARTITIONING)
{
DBUG_PRINT("info", ("Remove partitioning"));
if (!(thd->lex->create_info.used_fields & HA_CREATE_USED_ENGINE))