From 04ed04461ceac5ac26fbba8f2c6c0adaae32e391 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 31 Dec 2005 12:34:39 +0400 Subject: Making old tables seen with "#mysql50#" prefix, which makes it possible to run RENAME TABLE on old tables when upgrading from 5.0. TODO: A stored procedure to rename all tables and databases with old name format into new format, it will simplify upgrade. sql_table.cc: Making old tables seen with "#mysql50#" prefix. Adding warning into .err log when an old name is found. sql_show.cc: Skip non-directories before filename_to_tablename call, to avoid unnecessary warnings. strfunc.cc: Adding "error" argument to strconvert() mysql_priv.h: Adding "error" agrument to strconvert() sql/mysql_priv.h: Adding "error" agrument to strconvert() sql/strfunc.cc: Adding "error" argument to strconvert() sql/sql_show.cc: Skip non-directories before filename_to_tablename call, to avoid warning. sql/sql_table.cc: Making old tables seen with "#mysql50#" prefix, which makes it possible to run RENAME TABLE on old tables. Adding warning into .err log when an old name is found. --- sql/strfunc.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/strfunc.cc') diff --git a/sql/strfunc.cc b/sql/strfunc.cc index 4eb20faa97c..2525703172f 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -258,7 +258,7 @@ uint check_word(TYPELIB *lib, const char *val, const char *end, uint strconvert(CHARSET_INFO *from_cs, const char *from, - CHARSET_INFO *to_cs, char *to, uint to_length) + CHARSET_INFO *to_cs, char *to, uint to_length, uint *errors) { int cnvres; my_wc_t wc; @@ -308,6 +308,7 @@ outp: break; } *to= '\0'; + *errors= error_count; return (uint32) (to - to_start); } -- cgit v1.2.1