diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-29 19:22:22 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-29 19:22:22 +0200 |
| commit | 93ebd4d64d4748bd55834ac76b0b796d075f68b4 (patch) | |
| tree | c75b9bfc08d3d793d015a4b05b46c723ec15ce0e /sql/mysql_priv.h | |
| parent | 9c89ce7b3acc40fa9cd739b041611d79d43f55da (diff) | |
| parent | 3a180c331aa30b393d8cbeff51793ed61592bd75 (diff) | |
| download | mariadb-git-93ebd4d64d4748bd55834ac76b0b796d075f68b4.tar.gz | |
merge with 3.23.56 to get patches for --lower-case-table-names and
proper handling of SUM() in some functions.
BitKeeper/etc/logging_ok:
auto-union
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/group_by.result:
merge with 3.23.56
mysql-test/t/group_by.test:
merge with 3.23.56
sql/item_strfunc.h:
merge with 3.23.56
sql/mysqld.cc:
merge with 3.23.56
sql/sql_parse.cc:
merge with 3.23.56
sql/sql_yacc.yy:
merge with 3.23.56
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index ae536618e76..2afc4a5754e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -789,7 +789,7 @@ int create_frm(char *name,uint reclength,uchar *fileinfo, HA_CREATE_INFO *create_info, uint keys); void update_create_info_from_table(HA_CREATE_INFO *info, TABLE *form); int rename_file_ext(const char * from,const char * to,const char * ext); -bool check_db_name(const char *db); +bool check_db_name(char *db); bool check_column_name(const char *name); bool check_table_name(const char *name, uint length); char *get_field(MEM_ROOT *mem,TABLE *table,uint fieldnr); |