Cleanup of db option cacheing

Some bug fixes to last pushed code


mysql-test/mysql-test-run.sh:
  Fix for new valgrind (2.1.1)
mysql-test/r/bdb.result:
  Updated results
mysql-test/t/ps_1general.test:
  removed wrong error condition
sql/ha_berkeley.cc:
  Fix for index_flags() in new code
sql/item_strfunc.cc:
  Cleanup (fixed indentation, removed short variable names)
sql/mysql_priv.h:
  Cleanup of db option cacheing
sql/mysqld.cc:
  Cleanup of db option cacheing
sql/sql_db.cc:
  Cleanup of db option cacheing
sql/sql_parse.cc:
  Cleanup of db option cacheing
sql/sql_table.cc:
  sprintf -> strxmov
sql/table.cc:
  key_read should be tested on key parts, not the whole key

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index c0be95c0453..8d82ca44951 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1168,7 +1168,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
     HA_CREATE_INFO db_info;
     uint length;
     char  path[FN_REFLEN];
-    (void) sprintf(path,"%s/%s", mysql_data_home, db);
+    strxmov(path, mysql_data_home, "/", db, NullS);
     length= unpack_dirname(path,path);             // Convert if not unix
     strmov(path+length, MY_DB_OPT_FILE);
     load_db_opt(thd, path, &db_info);