diff options
| author | unknown <tim@threads.polyesthetic.msg> | 2001-04-17 09:18:37 -0400 |
|---|---|---|
| committer | unknown <tim@threads.polyesthetic.msg> | 2001-04-17 09:18:37 -0400 |
| commit | b0e8ab193130e7f13902c6f53b131391626d9759 (patch) | |
| tree | 42816db869b00b4e08615d77a11f1d6a2f7a133c /sql | |
| parent | 1a3e33558084c4c35b486ccdbef1d73d61bb7605 (diff) | |
| parent | b279170bf377c9fc0d386f9a905cc26712f127e3 (diff) | |
| download | mariadb-git-b0e8ab193130e7f13902c6f53b131391626d9759.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/sql_select.cc:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index e726a9969ca..8921d8e3b20 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -847,7 +847,7 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds, table_count=join->tables; stat=(JOIN_TAB*) join->thd->calloc(sizeof(JOIN_TAB)*table_count); stat_ref=(JOIN_TAB**) join->thd->alloc(sizeof(JOIN_TAB*)*MAX_TABLES); - table_vector=(TABLE**) join->thd->alloc(sizeof(TABLE**)*(table_count*2)); + table_vector=(TABLE**) join->thd->alloc(sizeof(TABLE*)*(table_count*2)); if (!stat || !stat_ref || !table_vector) DBUG_RETURN(1); // Eom /* purecov: inspected */ select=0; |