diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2008-08-26 14:50:32 +0500 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2008-08-26 14:50:32 +0500 |
| commit | 5b68e3dc30960d07079985eda13861aecb34e11a (patch) | |
| tree | 650c4111642d2ed19bf568f4b54aea90a3161049 /sql | |
| parent | 27ca994dffe238a4e4489dba1ec72918dfcaf729 (diff) | |
| parent | 3b1adb501e426682c0c7bdca455694d0d4c39342 (diff) | |
| download | mariadb-git-5b68e3dc30960d07079985eda13861aecb34e11a.tar.gz | |
merging fix
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 5365d5a44d8..e8cd226050b 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7418,7 +7418,7 @@ C_MODE_START int test_if_data_home_dir(const char *dir) { char path[FN_REFLEN]; - uint dir_len; + int dir_len; DBUG_ENTER("test_if_data_home_dir"); if (!dir) |