← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_locale.h

  • Committer: Stewart Smith
  • Date: 2008-11-21 16:06:07 UTC
  • mto: This revision was merged to the branch mainline in revision 593.
  • Revision ID: stewart@flamingspork.com-20081121160607-n6gdlt013spuo54r
remove mysql_frm_type
and fix engines to return correct value from delete_table when table doesn't exist.
(it should be ENOENT).

Also fix up some tests that manipulated frm files by hand. These tests are no longer valid and will need to be rewritten in the not too distant future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_locale.h
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#ifndef DRIZZLED_SQL_LOCALE_H
21
 
#define DRIZZLED_SQL_LOCALE_H
22
 
 
23
 
namespace drizzled
24
 
{
25
 
 
26
 
typedef struct st_typelib TYPELIB;
 
20
#ifndef DRIZZLE_SERVER_LOCALE_H
 
21
#define DRIZZLE_SERVER_LOCALE_H
27
22
 
28
23
typedef struct my_locale_st
29
24
{
30
25
  uint32_t  number;
31
 
  const bool is_ascii;
32
26
  const char *name;
33
27
  const char *description;
 
28
  const bool is_ascii;
34
29
  TYPELIB *month_names;
35
30
  TYPELIB *ab_month_names;
36
31
  TYPELIB *day_names;
37
32
  TYPELIB *ab_day_names;
 
33
#ifdef __cplusplus 
38
34
  my_locale_st(uint32_t number_par,
39
35
               const char *name_par, const char *descr_par, bool is_ascii_par,
40
36
               TYPELIB *month_names_par, TYPELIB *ab_month_names_par,
41
 
               TYPELIB *day_names_par, TYPELIB *ab_day_names_par) :
42
 
    number(number_par), is_ascii(is_ascii_par),
43
 
    name(name_par), description(descr_par),
 
37
               TYPELIB *day_names_par, TYPELIB *ab_day_names_par) : 
 
38
    number(number_par),
 
39
    name(name_par), description(descr_par), is_ascii(is_ascii_par),
44
40
    month_names(month_names_par), ab_month_names(ab_month_names_par),
45
41
    day_names(day_names_par), ab_day_names(ab_day_names_par)
46
42
  {}
 
43
#endif
47
44
} MY_LOCALE;
48
45
 
49
46
extern MY_LOCALE my_locale_en_US;
53
50
MY_LOCALE *my_locale_by_name(const char *name);
54
51
MY_LOCALE *my_locale_by_number(uint32_t number);
55
52
 
56
 
} /* namespace drizzled */
57
 
 
58
 
#endif /* DRIZZLED_SQL_LOCALE_H */
 
53
#endif /* DRIZZLE_SERVER_LOCALE_H */