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:/nfsdisk1/lars/bkroot/mysql-5.0-rpl

Browse Source 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2007-01-17 19:30:05 +01:00
parent c9078c40af ecc3a61944
commit 55fbeec175
37 changed files with 3012 additions and 1204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysql_priv.h
View File

@@ -108,6 +108,7 @@ enum Derivation
typedef struct my_locale_st
{
uint number;
const char *name;
const char *description;
const bool is_ascii;
@@ -116,9 +117,11 @@ typedef struct my_locale_st
TYPELIB *day_names;
TYPELIB *ab_day_names;
#ifdef __cplusplus
my_locale_st(const char *name_par, const char *descr_par, bool is_ascii_par,
my_locale_st(uint number_par,
const char *name_par, const char *descr_par, bool is_ascii_par,
TYPELIB *month_names_par, TYPELIB *ab_month_names_par,
TYPELIB *day_names_par, TYPELIB *ab_day_names_par) :
number(number_par),
name(name_par), description(descr_par), is_ascii(is_ascii_par),
month_names(month_names_par), ab_month_names(ab_month_names_par),
day_names(day_names_par), ab_day_names(ab_day_names_par)
@@ -130,6 +133,7 @@ extern MY_LOCALE my_locale_en_US;
extern MY_LOCALE *my_locales[];
MY_LOCALE *my_locale_by_name(const char *name);
MY_LOCALE *my_locale_by_number(uint number);
/***************************************************************************
Configuration parameters