diff options
| author | unknown <timour@askmonty.org> | 2012-10-18 15:57:12 +0300 |
|---|---|---|
| committer | unknown <timour@askmonty.org> | 2012-10-18 15:57:12 +0300 |
| commit | 69a7b04add1d8102b9f5add88ae691d8b04727bc (patch) | |
| tree | d8767b9ac1dd83919fd194feb3e0cb6451064c0a /sql/sp_head.cc | |
| parent | 807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff) | |
| parent | bc4a456758c8077e5377b8cfaed60af4311653a0 (diff) | |
| download | mariadb-git-69a7b04add1d8102b9f5add88ae691d8b04727bc.tar.gz | |
Merge mdev-452 with the latest 10.0-base.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index bde54ea2443..0c8f1d8916a 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -2427,7 +2427,6 @@ sp_head::fill_field_definition(THD *thd, LEX *lex, { LEX_STRING cmt = { 0, 0 }; uint unused1= 0; - int unused2= 0; if (field_def->init(thd, (char*) "", field_type, lex->length, lex->dec, lex->type, (Item*) 0, (Item*) 0, &cmt, 0, @@ -2444,8 +2443,7 @@ sp_head::fill_field_definition(THD *thd, LEX *lex, sp_prepare_create_field(thd, field_def); - if (prepare_create_field(field_def, &unused1, &unused2, &unused2, - HA_CAN_GEOMETRY)) + if (prepare_create_field(field_def, &unused1, HA_CAN_GEOMETRY)) { return TRUE; } |