database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
This commit is contained in:
dlenev@mysql.com
2006-02-27 20:11:54 +03:00
parent f0f8795beb 8dbdf5237e
commit c09d27c94d
25 changed files with 698 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_base.cc
View File

@ -4430,7 +4430,6 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
{
Field_iterator_table_ref it_1, it_2;
Natural_join_column *nj_col_1, *nj_col_2;
const char *field_name_1;
Query_arena *arena, backup;
bool add_columns= TRUE;
bool result= TRUE;
@ -4463,6 +4462,7 @@ mark_common_columns(THD *thd, TABLE_LIST *table_ref_1, TABLE_LIST *table_ref_2,
{
bool is_created_1;
bool found= FALSE;
const char *field_name_1;
if (!(nj_col_1= it_1.get_or_create_column_ref(&is_created_1)))
goto err;
field_name_1= nj_col_1->name();
@ -4663,7 +4663,6 @@ store_natural_using_join_columns(THD *thd, TABLE_LIST *natural_using_join,
{
Field_iterator_table_ref it_1, it_2;
Natural_join_column *nj_col_1, *nj_col_2;
bool is_created;
Query_arena *arena, backup;
bool result= TRUE;
List<Natural_join_column> *non_join_columns;