Commit 32208e02 authored by unknown's avatar unknown
Browse files

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23 

into sinisa.nasamreza.org:/mnt/work/mysql
parents f16873ec ce194f04

sql/gen_lex_hash.cc

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void print_arrays() 
	  function_plus,function_mod);



  int *prva= (int*) my_alloca(sizeof(int)*function_mod);

  for (i=0 ; i <= function_mod; i++)

  for (i=0 ; i < function_mod; i++)

    prva[i]= max_symbol;



  for (i=0;i<size;i++)

sql/sql_base.cc

+4 −3
Original line number Diff line number Diff line
@@ -1616,7 +1616,7 @@ Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length, 
    else

      thd->dupp_field=field;

  }

  if (check_grants && !thd->master_access && check_grant_column(thd,table,name,length))

  if (check_grants  && check_grant_column(thd,table,name,length))

    return WRONG_GRANT;

  return field;

}
@@ -1643,7 +1643,8 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables) 
      {

	found_table=1;

	Field *find=find_field_in_table(thd,tables->table,name,length,

					grant_option && !thd->master_access,1);

					grant_option && 

					tables->grant.want_privilege ,1);

	if (find)

	{

	  if (find == WRONG_GRANT)
@@ -1682,7 +1683,7 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables) 
  for (; tables ; tables=tables->next)

  {

    Field *field=find_field_in_table(thd,tables->table,name,length,

				     grant_option && !thd->master_access, allow_rowid);

				     grant_option && tables->grant.want_privilege ,allow_rowid);

    if (field)

    {

      if (field == WRONG_GRANT)