diff options
| author | unknown <monty@mysql.com> | 2006-06-30 04:10:27 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-30 04:10:27 +0300 |
| commit | c5ed64a416d3c9c658a22c9b20c4d36d31408d7e (patch) | |
| tree | e1ae218cd7e8117a9ca5cffbc7132f68bf73f967 /sql | |
| parent | 77deeb7ee6b533f3cafac3524362cd783c79b2e8 (diff) | |
| download | mariadb-git-c5ed64a416d3c9c658a22c9b20c4d36d31408d7e.tar.gz | |
Don't read ~/.my.cnf in mysqldump.test
heap/hp_test1.c:
Changed type from last commit
mysql-test/mysql-test-run.sh:
Fixed problem with running with --gdb and two masters
Don't disable ndb becasue we run gdb
mysql-test/t/mysqldump.test:
Don't read ~/.my.cnf
sql/ha_ndbcluster.cc:
Portability fix
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 11fdd33fad9..1837b22cf42 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -2300,12 +2300,14 @@ void ha_ndbcluster::unpack_record(byte* buf) { // Table with hidden primary key int hidden_no= table->fields; + char buff[22]; const NDBTAB *tab= (const NDBTAB *) m_table; const NDBCOL *hidden_col= tab->getColumn(hidden_no); NdbRecAttr* rec= m_value[hidden_no].rec; DBUG_ASSERT(rec); - DBUG_PRINT("hidden", ("%d: %s \"%llu\"", hidden_no, - hidden_col->getName(), rec->u_64_value())); + DBUG_PRINT("hidden", ("%d: %s \"%s\"", hidden_no, + hidden_col->getName(), + llstr(rec->u_64_value(), buff))); } print_results(); #endif |