database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

item_cmpfunc.cc, field.cc, sql_insert.cc, sql_class.h, sql_yacc.yy:

Browse Source 
Post merge fix.


sql/sql_yacc.yy:
  Post merge fix.
sql/sql_insert.cc:
  Post merge fix.
sql/sql_class.h:
  Post merge fix.
sql/item_cmpfunc.cc:
  Post merge fix.
sql/field.cc:
  Post merge fix.
This commit is contained in:
unknown
2007-06-11 13:38:37 +04:00
parent 237a1d22f1
commit 8becfb5fdb
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/field.cc
View File

@ -6426,8 +6426,8 @@ uint Field_string::get_key_image(uchar *buff, uint length, imagetype type_arg)
length / field_charset->mbmaxlen);
memcpy(buff, ptr, bytes);
if (bytes < length)
field_charset->cset->fill(field_charset, buff + bytes, length - bytes,
field_charset->pad_char);
field_charset->cset->fill(field_charset, (char*) buff + bytes,
length - bytes, field_charset->pad_char);
return bytes;
}

1
sql/item_cmpfunc.cc
View File

@ -1772,6 +1772,7 @@ void Item_func_between::fix_length_and_dec()
int i;
bool datetime_found= FALSE;
compare_as_dates= TRUE;
THD *thd= current_thd;
/*
As some compare functions are generated after sql_yacc,

1
sql/sql_class.h
View File

@ -73,6 +73,7 @@ typedef struct st_copy_info {
ha_rows updated;
ha_rows copied;
ha_rows error_count;
ha_rows touched; /* Number of touched records */
enum enum_duplicates handle_duplicates;
int escape_char, last_errno;
bool ignore;

1
sql/sql_insert.cc
View File

@ -1429,6 +1429,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
}
goto err;
}
info->touched++;
if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) ||
compare_record(table))
{

6
sql/sql_yacc.yy
View File

@ -7509,7 +7509,8 @@ select_derived2:
{
LEX *lex= Lex;
lex->derived_tables|= DERIVED_SUBQUERY;
if (!lex->expr_allows_subselect)
if (!lex->expr_allows_subselect ||
lex->sql_command == (int)SQLCOM_PURGE)
{
my_parse_error(ER(ER_SYNTAX_ERROR));
MYSQL_YYABORT;
@ -11231,7 +11232,8 @@ subselect_init:
subselect_start:
{
LEX *lex=Lex;
if (!lex->expr_allows_subselect)
if (!lex->expr_allows_subselect ||
lex->sql_command == (int)SQLCOM_PURGE)
{
my_parse_error(ER(ER_SYNTAX_ERROR));
MYSQL_YYABORT;