diff options
| author | unknown <bar@mysql.com> | 2006-03-22 15:10:42 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-22 15:10:42 +0400 |
| commit | 4ab459ce795a7999b79817abc035f73d63c972fd (patch) | |
| tree | 5cc57cfc0d9135797c712ea8a4e975304be26f5d /sql/table.cc | |
| parent | 0adda6df52f00ddd9533bd956f39bbf9ef80360e (diff) | |
| parent | 4399da26b4f5f169c2264ad8bd3579f86f926522 (diff) | |
| download | mariadb-git-4ab459ce795a7999b79817abc035f73d63c972fd.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.1-new
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index 3cba2c163ea..90d8569425a 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2212,7 +2212,7 @@ bool check_db_name(char *name) while (*name) { #if defined(USE_MB) && defined(USE_MB_IDENT) - last_char_is_space= my_isspace(default_charset_info, *name); + last_char_is_space= my_isspace(system_charset_info, *name); if (use_mb(system_charset_info)) { int len=my_ismbchar(system_charset_info, name, @@ -2254,7 +2254,7 @@ bool check_table_name(const char *name, uint length) while (name != end) { #if defined(USE_MB) && defined(USE_MB_IDENT) - last_char_is_space= my_isspace(default_charset_info, *name); + last_char_is_space= my_isspace(system_charset_info, *name); if (use_mb(system_charset_info)) { int len=my_ismbchar(system_charset_info, name, end); @@ -2283,7 +2283,7 @@ bool check_column_name(const char *name) while (*name) { #if defined(USE_MB) && defined(USE_MB_IDENT) - last_char_is_space= my_isspace(default_charset_info, *name); + last_char_is_space= my_isspace(system_charset_info, *name); if (use_mb(system_charset_info)) { int len=my_ismbchar(system_charset_info, name, |