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

Browse Source
This commit is contained in:
tim@threads.polyesthetic.msg
2001-04-17 09:18:37 -04:00
parent 13ef4d1db4 e19137f037
commit 1e3ab09a51
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BitKeeper/etc/logging_ok
View File

@@ -1,3 +1,4 @@
sasha@mysql.sashanet.com
monty@donna.mysql.fi
sasha@mysql.sashanet.com
serg@serg.mysql.com
tim@threads.polyesthetic.msg

2
sql/sql_select.cc
View File

@@ -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;