database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/misc/mysql/mysql-5.1

Browse Source 
into  mysql.com:/misc/mysql/mysql-5.1-opt


CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
This commit is contained in:
unknown
2008-03-27 23:34:12 +01:00
parent 099c888967 1561ee5c56
commit ea4c84eada
49 changed files with 453 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_db.cc
View File

@@ -606,7 +606,7 @@ CHARSET_INFO *get_default_db_collation(THD *thd, const char *db_name)
*/
bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
bool silent)
{
char path[FN_REFLEN+16];