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 /sql | |
| 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
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |