Commit 392b283f authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
parents a7b05cb7 a33bc2c2

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -5807,7 +5807,7 @@ bool Item_insert_value::fix_fields(THD *thd, Item **items) 
  if (!arg->fixed)

  {

    bool res;

    st_table_list *orig_next_table= context->last_name_resolution_table;

    TABLE_LIST *orig_next_table= context->last_name_resolution_table;

    context->last_name_resolution_table= context->first_name_resolution_table;

    res= arg->fix_fields(thd, &arg);

    context->last_name_resolution_table= orig_next_table;

sql/item.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#endif



class Protocol;

struct st_table_list;

struct TABLE_LIST;

void item_init(void);			/* Init item functions */

class Item_field;

sql/mysql_priv.h

+3 −3
Original line number Diff line number Diff line
@@ -455,9 +455,9 @@ void debug_sync_point(const char* lock_name, uint lock_timeout); 
#define SHOW_LOG_STATUS_FREE "FREE"

#define SHOW_LOG_STATUS_INUSE "IN USE"



struct st_table_list;

struct TABLE_LIST;

class String;

void view_store_options(THD *thd, st_table_list *table, String *buff);

void view_store_options(THD *thd, TABLE_LIST *table, String *buff);



/* Options to add_table_to_list() */

#define TL_OPTION_UPDATING	1
@@ -1104,7 +1104,7 @@ bool close_thread_table(THD *thd, TABLE **table_ptr); 
void close_temporary_tables(THD *thd);

void close_tables_for_reopen(THD *thd, TABLE_LIST **tables);

TABLE_LIST *find_table_in_list(TABLE_LIST *table,

                               st_table_list *TABLE_LIST::*link,

                               TABLE_LIST *TABLE_LIST::*link,

                               const char *db_name,

                               const char *table_name);

TABLE_LIST *unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list,

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ void close_temporary_tables(THD *thd) 
*/



TABLE_LIST *find_table_in_list(TABLE_LIST *table,

                               st_table_list *TABLE_LIST::*link,

                               TABLE_LIST *TABLE_LIST::*link,

                               const char *db_name,

                               const char *table_name)

{

sql/sql_lex.cc

+1 −1
Original line number Diff line number Diff line
@@ -1965,7 +1965,7 @@ bool st_lex::need_correct_ident() 
    VIEW_CHECK_CASCADED  CHECK OPTION CASCADED

*/



uint8 st_lex::get_effective_with_check(st_table_list *view)

uint8 st_lex::get_effective_with_check(TABLE_LIST *view)

{

  if (view->select_lex->master_unit() == &unit &&

      which_check_option_applicable())