diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-07-03 22:50:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-07-03 22:50:34 +0300 |
| commit | a9d1d76e5eb33d7d7762140625d09bbfb9ae91bb (patch) | |
| tree | 8bc0efc14fbc8ff396dec2a802545bfc8ec7c6ca /sql/strfunc.h | |
| parent | 68262ba648886e2d5f35fc85e3cc45df7ffd9ae5 (diff) | |
| download | mariadb-git-a9d1d76e5eb33d7d7762140625d09bbfb9ae91bb.tar.gz | |
Fixed issues with partitions and create temporary table SELECT ...
Merged all ddl_logging code.
Merged sql_partition.cc
innodb_mysql_lock2.test and partition_cache.test now works.
Changed interface to strconvert() to make it easier to use with not \0 terminated strings.
sql/sql_partition.cc:
Full merge with 5.6
sql/sql_table.cc:
Merged all ddl_logging code
sql/strfunc.cc:
Added from_length argument to strconvert() to make it possible to use without end terminated strings.
sql/strfunc.h:
Added from_length argument to strconvert() to make it possible to use without end terminated strings.
Diffstat (limited to 'sql/strfunc.h')
| -rw-r--r-- | sql/strfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/strfunc.h b/sql/strfunc.h index 57c5427fcd0..7b031710c76 100644 --- a/sql/strfunc.h +++ b/sql/strfunc.h @@ -43,7 +43,7 @@ char *set_to_string(THD *thd, LEX_STRING *result, ulonglong set, /* These functions were protected by INNODB_COMPATIBILITY_HOOKS */ -uint strconvert(CHARSET_INFO *from_cs, const char *from, +uint strconvert(CHARSET_INFO *from_cs, const char *from, uint from_length, CHARSET_INFO *to_cs, char *to, uint to_length, uint *errors); #endif /* STRFUNC_INCLUDED */ |