diff options
| author | unknown <ramil@mysql.com> | 2005-06-08 12:22:14 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-06-08 12:22:14 +0500 |
| commit | d8839004598bb024e0d60bbe1dba1fda8dee7a6a (patch) | |
| tree | 206baa964c83b3d2bf60e6d078ee05ba5bba558a | |
| parent | 41afcdb6c6855d9e81ddba209362b490230a5aed (diff) | |
| parent | ceca5e26c0814a8d59bfc0be81d89648e516bf82 (diff) | |
| download | mariadb-git-d8839004598bb024e0d60bbe1dba1fda8dee7a6a.tar.gz | |
Merge mysql.com:/usr/home/ram/work/mysql-5.0-release
into mysql.com:/usr/home/ram/work/mysql-5.0
| -rw-r--r-- | sql/item_subselect.cc | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 07c0ce2b6e3..7a72b78b6f4 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -601,7 +601,7 @@ void Item_exists_subselect::fix_length_and_dec() max_length= 1; max_columns= engine->cols(); /* We need only 1 row to determine existence */ - unit->global_parameters->select_limit= new Item_int(1); + unit->global_parameters->select_limit= new Item_int((int32) 1); } double Item_exists_subselect::val_real() diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index e0529da9302..719b42e890f 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -7985,7 +7985,7 @@ handler: LEX *lex=Lex; lex->sql_command = SQLCOM_HA_READ; lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */ - lex->current_select->select_limit= new Item_int(1); + lex->current_select->select_limit= new Item_int((int32) 1); lex->current_select->offset_limit= 0; if (!lex->current_select->add_table_to_list(lex->thd, $2, 0, 0)) YYABORT; |