diff options
| author | unknown <ingo/istruewing@chilla.local> | 2006-08-02 18:10:51 +0200 |
|---|---|---|
| committer | unknown <ingo/istruewing@chilla.local> | 2006-08-02 18:10:51 +0200 |
| commit | 312034fa4491708f19aff9efd527c50519cc0078 (patch) | |
| tree | 376ef2cb6c75057dd05993c3db0e65e82dd33e4d /sql/ha_myisammrg.cc | |
| parent | 3232bd58e861d873ae1cfe9f4ceefe6529ff90a3 (diff) | |
| parent | ef976d20c95cb547dcb6123f0072d06bea61f177 (diff) | |
| download | mariadb-git-312034fa4491708f19aff9efd527c50519cc0078.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-bug18775
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/sql_db.cc:
Bug#18775 - Temporary table from alter table visible to other threads
Manual merge
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 6be714dc2e3..024fe2632c6 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -473,7 +473,7 @@ int ha_myisammrg::create(const char *name, register TABLE *form, an embedded server without changing the paths in the .MRG file. */ uint length= build_table_filename(buff, sizeof(buff), - tables->db, tables->table_name, ""); + tables->db, tables->table_name, "", 0); /* If a MyISAM table is in the same directory as the MERGE table, we use the table name without a path. This means that the |