Commit de150e7b authored by unknown's avatar unknown
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql 

into sinisa.nasamreza.org:/mnt/work/mysql
parents f67fe80e cad553de

sql/opt_sum.cc

+3 −4
Original line number Diff line number Diff line
@@ -165,10 +165,9 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) 
	    error=table->file->index_last(table->record[0]) !=0;

	  else

	  {

	    (void) table->file->index_read(table->record[0], key_buff,

           error = table->file->index_read(table->record[0], key_buff,

                                          ref.key_length,

					   HA_READ_AFTER_KEY);

	    error=table->file->index_prev(table->record[0]) ||

                                         HA_READ_PREFIX_LAST) ||

	      key_cmp(table,key_buff,ref.key,ref.key_length);

	  }

	  if (table->key_read)

sql/sql_acl.cc

+3 −1
Original line number Diff line number Diff line
@@ -995,7 +995,9 @@ static int replace_user_table(TABLE *table, const LEX_USER &combo, 
  {

    if (combo.password.length != HASH_PASSWORD_LENGTH)

    {

      my_error(ER_PASSWORD_NO_MATCH,MYF(0));

      my_printf_error(ER_PASSWORD_NO_MATCH,

          "Password hash should be a %d-digit hexadecimal number",

          MYF(0),HASH_PASSWORD_LENGTH);

      DBUG_RETURN(-1);

    }

    password=combo.password.str;

sql/sql_class.cc

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0), 
  */

  {

    pthread_mutex_lock(&LOCK_thread_count);

    ulong tmp=(ulong) (rnd(&sql_rand) * 3000000);

    ulong tmp=(ulong) (rnd(&sql_rand) * ((ulong)~0L));

    randominit(&rand, tmp + (ulong) start_time,

	       tmp + (ulong) thread_id);

    pthread_mutex_unlock(&LOCK_thread_count);