diff options
| author | unknown <pem@mysql.comhem.se> | 2003-12-01 18:24:09 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-12-01 18:24:09 +0100 |
| commit | da7ca9ba04364f61a712102f8c7095ba7d182bf5 (patch) | |
| tree | b726e4d966f0f53b2e8c810e3a57cf44e87c7f77 /sql | |
| parent | 38f853d291075a8eaa9d408a23626b09aa7ac1d2 (diff) | |
| download | mariadb-git-da7ca9ba04364f61a712102f8c7095ba7d182bf5.tar.gz | |
Post-merge fixes.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/protocol_cursor.cc | 6 | ||||
| -rw-r--r-- | sql/sql_union.cc | 4 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sql/protocol_cursor.cc b/sql/protocol_cursor.cc index b9e9c14f361..749b66785d4 100644 --- a/sql/protocol_cursor.cc +++ b/sql/protocol_cursor.cc @@ -108,7 +108,7 @@ bool Protocol_cursor::write() data_tmp= (byte **)(new_record + 1); new_record->data= (char **)data_tmp; - to= (byte *)data + (field_count + 1)*sizeof(char *); + to= (byte *)data_tmp + (field_count + 1)*sizeof(char *); for (; cur_field < fields_end; ++cur_field, ++data_tmp) { @@ -123,7 +123,7 @@ bool Protocol_cursor::write() // TODO error signal send_error(thd, CR_MALFORMED_PACKET); return TRUE; } - *data= to; + *data_tmp= to; memcpy(to,(char*) cp,len); to[len]=0; to+=len+1; @@ -132,7 +132,7 @@ bool Protocol_cursor::write() cur_field->max_length=len; } } - *data= 0; + *data_tmp= 0; *prev_record= new_record; prev_record= &new_record->next; diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 33204608fb1..25620229844 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -221,7 +221,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result) union_result->set_table(table); item_list.empty(); - thd_arg->lex.current_select= lex_select_save; + thd_arg->lex->current_select= lex_select_save; { Field **field; for (field= table->field; *field; field++) @@ -234,7 +234,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result) else first_select->braces= 0; // remove our changes - thd_arg->lex.current_select= lex_select_save; + thd_arg->lex->current_select= lex_select_save; DBUG_RETURN(res || thd_arg->is_fatal_error ? 1 : 0); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a4972231c29..cd08e702cd5 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1777,7 +1777,7 @@ sp_case: { /* Simple case: <caseval> = <whenval> */ LEX_STRING ivar; - ivar.str= "_tmp_"; + ivar.str= (char *)"_tmp_"; ivar.length= 5; Item *var= (Item*) new Item_splocal(ivar, ctx->current_framesize()-1); |