diff options
author | Alexey Botchkov <holyfoot@mysql.com> | 2008-08-26 13:32:43 +0500 |
---|---|---|
committer | Alexey Botchkov <holyfoot@mysql.com> | 2008-08-26 13:32:43 +0500 |
commit | 8d3eb141e08103c5119854948dd793ec55d3cc00 (patch) | |
tree | 200730f9c3f71ec931278abde26c627495e4a758 /sql/sql_parse.cc | |
parent | ec524d50a86b6fb75dc3dc5704fbed34568aa35c (diff) | |
parent | 1ee4a3ac823dc98a0abb70cd28ffbf6a10da221d (diff) | |
download | mariadb-git-8d3eb141e08103c5119854948dd793ec55d3cc00.tar.gz |
merging fix
Diffstat (limited to 'sql/sql_parse.cc')
-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 9c2b81cabf1..83b111b7c4c 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -7950,7 +7950,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) |