mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Three bug fixes and one fix being undone.

Browse source
This commit is contained in:
Sinisa@sinisa.nasamreza.org 2003-04-19 23:18:35 +03:00
parent 0fc5b734e7
commit d91d6d5e2e
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/innodb_handler.result
View file

@ -147,4 +147,5 @@ HANDLER t1 READ `primary` = (1, 1000);
no1 no2 no1 no2
HANDLER t1 READ `primary` PREV; HANDLER t1 READ `primary` PREV;
no1 no2 no1 no2
1 275
DROP TABLE t1; DROP TABLE t1;

7
sql/sql_db.cc
View file

@ -351,6 +351,13 @@ bool mysql_change_db(THD *thd,const char *name)
x_free(dbname); x_free(dbname);
DBUG_RETURN(1); 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)); DBUG_PRINT("info",("Use database: %s", dbname));
if (test_all_bits(thd->master_access,DB_ACLS)) if (test_all_bits(thd->master_access,DB_ACLS))
db_access=DB_ACLS; db_access=DB_ACLS;

5
sql/sql_update.cc
View file

@ -478,11 +478,6 @@ int multi_update::prepare(List<Item> &not_used_values)
table->used_keys=0; table->used_keys=0;
table->pos_in_table_list= tl; table->pos_in_table_list= tl;
} }
else
{
table_ref->lock_type=TL_READ;
mysql_unlock_some_tables(thd,&table,1);
}
} }

5
strings/ctype-tis620.c
View file

@ -491,7 +491,7 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
return((uchar*) tstr); return((uchar*) tstr);
} }
pLeft4 = pRight4;*/ pLeft4 = pRight4;*/
while(len--) { while((len--)) {
if(isldvowel(*p) && isconsnt(p[1])) { if(isldvowel(*p) && isconsnt(p[1])) {
*pRight1++ = t_ctype[p[1]][0]; *pRight1++ = t_ctype[p[1]][0];
*pRight2++ = t_ctype[p[1]][1]; *pRight2++ = t_ctype[p[1]][1];
@ -501,7 +501,8 @@ static uchar* thai2sortable(const uchar * tstr,uint len)
*pRight2++ = t_ctype[*p][1]; *pRight2++ = t_ctype[*p][1];
*pRight3++ = t_ctype[*p][2]; *pRight3++ = t_ctype[*p][2];
/* *pRight4++ = t_ctype[*p][3]; */ /* *pRight4++ = t_ctype[*p][3]; */
len--; if (!(len--))
break;
p += 2; p += 2;
} else { } else {
*pRight1 = t_ctype[*p][0]; *pRight1 = t_ctype[*p][0];