1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source 
BitKeeper/etc/logging_ok:
  Auto merged
This commit is contained in:
unknown 2001-02-13 08:58:32 +02:00
commit b4cc568beb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -1 +1,2 @@
mwagner@evoq.mwagner.org mwagner@evoq.mwagner.org
tfr@coyote.emotion.ee

2
client/mysqldump.c
View File

@ -37,7 +37,7 @@
** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee> ** Tõnu 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>

2
sql/sql_show.cc
View File

@ -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++)
{ {