Commit 8a0516ad authored by tfr@coyote.emotion.ee's avatar tfr@coyote.emotion.ee
Browse files

Merge

parents 172dfa44 06aad9c7

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
mwagner@evoq.mwagner.org

tfr@coyote.emotion.ee

client/mysqldump.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
**   Tnu Samuel  <tonu@please.do.not.remove.this.spam.ee>

**/



#define DUMP_VERSION "8.12"

#define DUMP_VERSION "8.13"



#include <global.h>

#include <my_sys.h>

sql/sql_show.cc

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ store_create_info(THD *thd, TABLE *table, String *packet) 
    if(i != primary_key)

     append_identifier(thd,packet,key_info->name);



    packet->append('(');

    packet->append(" (", 2);



    for (uint j=0 ; j < key_info->key_parts ; j++,key_part++)

    {