Merge dator5.(none):/home/pappa/clean-mysql-5.1

into  dator5.(none):/home/pappa/bug18198


sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 19 insertions, 19 deletions

diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 2cf13216f6d..eedcdcb2083 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -46,12 +46,12 @@
 */
 const LEX_STRING partition_keywords[]=
 {
-  { (char *) STRING_WITH_LEN("HASH") },
-  { (char *) STRING_WITH_LEN("RANGE") },
-  { (char *) STRING_WITH_LEN("LIST") }, 
-  { (char *) STRING_WITH_LEN("KEY") },
-  { (char *) STRING_WITH_LEN("MAXVALUE") },
-  { (char *) STRING_WITH_LEN("LINEAR ") }
+  { C_STRING_WITH_LEN("HASH") },
+  { C_STRING_WITH_LEN("RANGE") },
+  { C_STRING_WITH_LEN("LIST") }, 
+  { C_STRING_WITH_LEN("KEY") },
+  { C_STRING_WITH_LEN("MAXVALUE") },
+  { C_STRING_WITH_LEN("LINEAR ") }
 };
 static const char *part_str= "PARTITION";
 static const char *sub_str= "SUB";
@@ -3840,7 +3840,7 @@ bool mysql_unpack_partition(THD *thd, const uchar *part_buf,
       char *src_db= table_ident->db.str ? table_ident->db.str : thd->db;
       char *src_table= table_ident->table.str;
       char buf[FN_REFLEN];
-      build_table_filename(buf, sizeof(buf), src_db, src_table, "");
+      build_table_filename(buf, sizeof(buf), src_db, src_table, "", 0);
       if (partition_default_handling(table, part_info,
                                      FALSE, buf))
       {
@@ -5114,7 +5114,7 @@ static bool mysql_change_partitions(ALTER_PARTITION_PARAM_TYPE *lpt)
   handler *file= lpt->table->file;
   DBUG_ENTER("mysql_change_partitions");
 
-  build_table_filename(path, sizeof(path), lpt->db, lpt->table_name, "");
+  build_table_filename(path, sizeof(path), lpt->db, lpt->table_name, "", 0);
   if ((error= file->change_partitions(lpt->create_info, path, &lpt->copied,
                                       &lpt->deleted, lpt->pack_frm_data,
                                       lpt->pack_frm_len)))
@@ -5154,7 +5154,7 @@ static bool mysql_rename_partitions(ALTER_PARTITION_PARAM_TYPE *lpt)
   int error;
   DBUG_ENTER("mysql_rename_partitions");
 
-  build_table_filename(path, sizeof(path), lpt->db, lpt->table_name, "");
+  build_table_filename(path, sizeof(path), lpt->db, lpt->table_name, "", 0);
   if ((error= lpt->table->file->rename_partitions(path)))
   {
     if (error != 1)
@@ -5195,7 +5195,7 @@ static bool mysql_drop_partitions(ALTER_PARTITION_PARAM_TYPE *lpt)
   int error;
   DBUG_ENTER("mysql_drop_partitions");
 
-  build_table_filename(path, sizeof(path), lpt->db, lpt->table_name, "");
+  build_table_filename(path, sizeof(path), lpt->db, lpt->table_name, "", 0);
   if ((error= lpt->table->file->drop_partitions(path)))
   {
     lpt->table->file->print_error(error, MYF(0));
@@ -5546,7 +5546,7 @@ static bool write_log_drop_shadow_frm(ALTER_PARTITION_PARAM_TYPE *lpt)
   DBUG_ENTER("write_log_drop_shadow_frm");
 
   build_table_filename(shadow_path, sizeof(shadow_path), lpt->db,
-                       lpt->table_name, "#");
+                       lpt->table_name, "#", 0);
   pthread_mutex_lock(&LOCK_gdl);
   if (write_log_replace_delete_frm(lpt, 0UL, NULL,
                                   (const char*)shadow_path, FALSE))
@@ -5594,9 +5594,9 @@ static bool write_log_rename_frm(ALTER_PARTITION_PARAM_TYPE *lpt)
 
   part_info->first_log_entry= NULL;
   build_table_filename(path, sizeof(path), lpt->db,
-                       lpt->table_name, "");
+                       lpt->table_name, "", 0);
   build_table_filename(shadow_path, sizeof(shadow_path), lpt->db,
-                       lpt->table_name, "#");
+                       lpt->table_name, "#", 0);
   pthread_mutex_lock(&LOCK_gdl);
   if (write_log_replace_delete_frm(lpt, 0UL, shadow_path, path, TRUE))
     goto error;
@@ -5648,9 +5648,9 @@ static bool write_log_drop_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
 
   part_info->first_log_entry= NULL;
   build_table_filename(path, sizeof(path), lpt->db,
-                       lpt->table_name, "");
+                       lpt->table_name, "", 0);
   build_table_filename(tmp_path, sizeof(tmp_path), lpt->db,
-                       lpt->table_name, "#");
+                       lpt->table_name, "#", 0);
   pthread_mutex_lock(&LOCK_gdl);
   if (write_log_dropped_partitions(lpt, &next_entry, (const char*)path,
                                    FALSE))
@@ -5705,9 +5705,9 @@ static bool write_log_add_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
   DBUG_ENTER("write_log_add_change_partition");
 
   build_table_filename(path, sizeof(path), lpt->db,
-                       lpt->table_name, "");
+                       lpt->table_name, "", 0);
   build_table_filename(tmp_path, sizeof(tmp_path), lpt->db,
-                       lpt->table_name, "#");
+                       lpt->table_name, "#", 0);
   pthread_mutex_lock(&LOCK_gdl);
   if (write_log_dropped_partitions(lpt, &next_entry, (const char*)path,
                                    FALSE))
@@ -5762,9 +5762,9 @@ static bool write_log_final_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
 
   part_info->first_log_entry= NULL;
   build_table_filename(path, sizeof(path), lpt->db,
-                       lpt->table_name, "");
+                       lpt->table_name, "", 0);
   build_table_filename(shadow_path, sizeof(shadow_path), lpt->db,
-                       lpt->table_name, "#");
+                       lpt->table_name, "#", 0);
   pthread_mutex_lock(&LOCK_gdl);
   if (write_log_dropped_partitions(lpt, &next_entry, (const char*)path,
                       lpt->alter_info->flags & ALTER_REORGANIZE_PARTITION))