mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
Three bug fixes and one fix being undone.
This commit is contained in:
parent
0fc5b734e7
commit
d91d6d5e2e
4 changed files with 11 additions and 7 deletions
|
@ -147,4 +147,5 @@ HANDLER t1 READ `primary` = (1, 1000);
|
|||
no1 no2
|
||||
HANDLER t1 READ `primary` PREV;
|
||||
no1 no2
|
||||
1 275
|
||||
DROP TABLE t1;
|
||||
|
|
|
@ -351,6 +351,13 @@ bool mysql_change_db(THD *thd,const char *name)
|
|||
x_free(dbname);
|
||||
DBUG_RETURN(1);
|
||||
}
|
||||
if (dbname[0] == '`' && dbname[db_length-1] == '`')
|
||||
{
|
||||
int counter=1;
|
||||
for (; counter < db_length - 1; counter++)
|
||||
dbname[counter-1]=dbname[counter];
|
||||
dbname[(db_length= counter)-1]='\0';
|
||||
}
|
||||
DBUG_PRINT("info",("Use database: %s", dbname));
|
||||
if (test_all_bits(thd->master_access,DB_ACLS))
|
||||
db_access=DB_ACLS;
|
||||
|
|
|
@ -478,11 +478,6 @@ int multi_update::prepare(List<Item> ¬_used_values)
|
|||
table->used_keys=0;
|
||||
table->pos_in_table_list= tl;
|
||||
}
|
||||
else
|
||||
{
|
||||
table_ref->lock_type=TL_READ;
|
||||
mysql_unlock_some_tables(thd,&table,1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -491,7 +491,7 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
|
|||
return((uchar*) tstr);
|
||||
}
|
||||
pLeft4 = pRight4;*/
|
||||
while(len--) {
|
||||
while((len--)) {
|
||||
if(isldvowel(*p) && isconsnt(p[1])) {
|
||||
*pRight1++ = t_ctype[p[1]][0];
|
||||
*pRight2++ = t_ctype[p[1]][1];
|
||||
|
@ -501,7 +501,8 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
|
|||
*pRight2++ = t_ctype[*p][1];
|
||||
*pRight3++ = t_ctype[*p][2];
|
||||
/* *pRight4++ = t_ctype[*p][3]; */
|
||||
len--;
|
||||
if (!(len--))
|
||||
break;
|
||||
p += 2;
|
||||
} else {
|
||||
*pRight1 = t_ctype[*p][0];
|
||||
|
|
Loading…
Reference in a new issue