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

After merge fixes

Browse Source
This commit is contained in:
monty@mysql.com 2006-06-30 20:07:33 +03:00
parent 2f86009c9e
commit f62829636b
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bzrignore
View File

@ -1286,3 +1286,5 @@ vio/viotest.cpp
zlib/*.ds? zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj
BitKeeper/etc/RESYNC_TREE BitKeeper/etc/RESYNC_TREE
mysql-test/r/*.log
scripts/mysql_upgrade_shell

1
include/my_handler.h
View File

@ -18,7 +18,6 @@
#ifndef _my_handler_h #ifndef _my_handler_h
#define _my_handler_h #define _my_handler_h
#include "my_global.h"
#include "my_base.h" #include "my_base.h"
#include "m_ctype.h" #include "m_ctype.h"
#include "myisampack.h" #include "myisampack.h"

4
mysql-test/r/key.result
View File

@ -341,8 +341,8 @@ i2 int(11) NO UNI
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`i1` int(11) NOT NULL default '0', `i1` int(11) NOT NULL,
`i2` int(11) NOT NULL default '0', `i2` int(11) NOT NULL,
UNIQUE KEY `i1idx` (`i1`), UNIQUE KEY `i1idx` (`i1`),
UNIQUE KEY `i2idx` (`i2`) UNIQUE KEY `i2idx` (`i2`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1

2
sql/ha_ndbcluster.cc
View File

@ -6476,7 +6476,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
("Table: %s commit_count: %s rows: %s", ("Table: %s commit_count: %s rows: %s",
share->table_name, share->table_name,
llstr(stat.commit_count, buff), llstr(stat.commit_count, buff),
llstr(stat.row_count, buff2)); llstr(stat.row_count, buff2)));
} }
else else
{ {