summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-08-28 00:49:54 +0300
committerunknown <monty@mysql.com>2004-08-28 00:49:54 +0300
commitd15fefa95f31481cf48eaa1108792945ebc96acb (patch)
treed8470cb550581be2d6ffbc160a5a1b2b1b17a399 /sql/table.cc
parent2fddfe2ff1650e6a3689ccd9b9c1a69c5dde31cf (diff)
downloadmariadb-git-d15fefa95f31481cf48eaa1108792945ebc96acb.tar.gz
Code style fixes.
Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options() mysql-test/r/lowercase_table.result: Changed foo database -> mysqltest More test cases mysql-test/t/lowercase_table.test: Changed foo database -> mysqltest More test cases mysys/my_getopt.c: Fix new code to use MySQL indentation style sql/log.cc: Change to use MySQL indentation style and naming conventions Remove usage of strlen() and strcat() sql/mysqld.cc: Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options() sql/sql_base.cc: Added comment sql/table.cc: Added #if MYSQL_VERSION_ID < 40100 to ensure code is merged correctly
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 898ed4bca3d..573fa11a4c4 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -999,10 +999,7 @@ void append_unescaped(String *res,const char *pos)
for (; *pos ; )
{
-#ifdef USE_MB
- /*
- Note, there is no needs to propagate this code into 4.1.
- */
+#if defined(USE_MB) && MYSQL_VERSION_ID < 40100
uint mblen;
if (use_mb(default_charset_info) &&
(mblen= my_ismbchar(default_charset_info, pos, end)))