Commit e6f39cab authored by unknown's avatar unknown

Merge


BitKeeper/etc/logging_ok:
  Auto merged
parents e163cd5d 5420355f
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
tfr@coyote.emotion.ee
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
** Tnu Samuel <tonu@please.do.not.remove.this.spam.ee> ** Tnu Samuel <tonu@please.do.not.remove.this.spam.ee>
**/ **/
#define DUMP_VERSION "8.12" #define DUMP_VERSION "8.13"
#include <global.h> #include <global.h>
#include <my_sys.h> #include <my_sys.h>
...@@ -808,7 +808,7 @@ static uint getTableStructure(char *table, char* db) ...@@ -808,7 +808,7 @@ static uint getTableStructure(char *table, char* db)
putc(',', sql_file); putc(',', sql_file);
fputs(quote_name(row[4],name_buff), sql_file); fputs(quote_name(row[4],name_buff), sql_file);
if (row[7]) if (row[7])
fprintf(sql_file, "(%s)",row[7]); /* Sub key */ fprintf(sql_file, " (%s)",row[7]); /* Sub key */
} }
if (keynr) if (keynr)
putc(')', sql_file); putc(')', sql_file);
......
...@@ -846,7 +846,7 @@ store_create_info(THD *thd, TABLE *table, String *packet) ...@@ -846,7 +846,7 @@ store_create_info(THD *thd, TABLE *table, String *packet)
if(i != primary_key) if(i != primary_key)
append_identifier(thd,packet,key_info->name); append_identifier(thd,packet,key_info->name);
packet->append('('); packet->append(" (", 2);
for (uint j=0 ; j < key_info->key_parts ; j++,key_part++) for (uint j=0 ; j < key_info->key_parts ; j++,key_part++)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment