diff options
| author | unknown <monty@mysql.com> | 2006-06-30 20:07:33 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-30 20:07:33 +0300 |
| commit | 0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95 (patch) | |
| tree | da64f683229006c098861b31377eeea29039ae5c | |
| parent | 9606675ba20eb309a1f402f92d06e2de8aed22d2 (diff) | |
| download | mariadb-git-0bbc6fbeb7cb60d263510ce1f4c116a69ec77f95.tar.gz | |
After merge fixes
BitKeeper/etc/ignore:
added scripts/mysql_upgrade_shell
include/my_handler.h:
my_handler.h should not include my_global.h
mysql-test/r/key.result:
Update results after merge
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | include/my_handler.h | 1 | ||||
| -rw-r--r-- | mysql-test/r/key.result | 4 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore index ef02a085144..7ea7f1ab7e2 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1286,3 +1286,5 @@ vio/viotest.cpp zlib/*.ds? zlib/*.vcproj BitKeeper/etc/RESYNC_TREE +mysql-test/r/*.log +scripts/mysql_upgrade_shell diff --git a/include/my_handler.h b/include/my_handler.h index d531e0fb3e1..61665090853 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -18,7 +18,6 @@ #ifndef _my_handler_h #define _my_handler_h -#include "my_global.h" #include "my_base.h" #include "m_ctype.h" #include "myisampack.h" diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result index 6a362d6b86a..0174ea45935 100644 --- a/mysql-test/r/key.result +++ b/mysql-test/r/key.result @@ -341,8 +341,8 @@ i2 int(11) NO UNI show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `i1` int(11) NOT NULL default '0', - `i2` int(11) NOT NULL default '0', + `i1` int(11) NOT NULL, + `i2` int(11) NOT NULL, UNIQUE KEY `i1idx` (`i1`), UNIQUE KEY `i2idx` (`i2`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index c5711d8f0fd..18c220f3f88 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6476,7 +6476,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) ("Table: %s commit_count: %s rows: %s", share->table_name, llstr(stat.commit_count, buff), - llstr(stat.row_count, buff2)); + llstr(stat.row_count, buff2))); } else { |