mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461)

Browse source 
DROP DATABASE now assumes RAID directories are in hex. (Bug #2627)
Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506)
Test in configure if pthread_key_delete() exists (to fix compile problem on SCO) (Bug #2461)


BUILD/compile-pentium-max:
  Added --with-raid
configure.in:
  Added testing of pthread_key_delete (to fix compile problem on SCO)  (Bug #2461)
include/my_pthread.h:
  Added testing of pthread_key_delete (to fix compile problem on SCO)  (Bug #2461)
innobase/include/data0data.ic:
  Added missing newline
mysql-test/r/raid.result:
  Test of DROP DATABASE with RAID directories in hex
mysql-test/t/raid.test:
  Test of DROP DATABASE with RAID directories in hex
sql/sql_db.cc:
  DROP DATABASE could not drop databases with RAID tables that had
  more than 9 RAID_CHUNKS because DROP DATABASE assumed raid tables where in decimal while the RAID CREATE code assumed directories was in hex.(Bug #2627)
sql/sql_select.cc:
  Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506)
sql/sql_udf.cc:
  mysqld crashed if mysql.func table didn't exists (Bug #2577)
This commit is contained in:
unknown 2004-02-05 09:12:23 +01:00
commit d295f07c42
9 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/sql_db.cc
View file

@ -219,7 +219,7 @@ exit2:
/*
Removes files with known extensions plus all found subdirectories that
are 2 digits (raid directories).
are 2 hex digits (raid directories).
thd MUST be set when calling this function!
*/
@ -245,7 +245,10 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
DBUG_PRINT("info",("Examining: %s", file->name));
/* Check if file is a raid directory */
if (isdigit(file->name[0]) && isdigit(file->name[1]) &&
if ((isdigit(file->name[0]) ||
(file->name[0] >= 'a' && file->name[0] <= 'f')) &&
(isdigit(file->name[1]) ||
(file->name[1] >= 'a' && file->name[1] <= 'f')) &&
!file->name[2] && !level)
{
char newpath[FN_REFLEN];