summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@mysql.com>2009-05-19 12:28:05 +0300
committerMichael Widenius <monty@mysql.com>2009-05-19 12:28:05 +0300
commit224108a19ec945ac1c3da6c5ec36b6777fd59444 (patch)
tree0c9eed2ea6f66b7a2416b6a663906a7841e33deb /sql/sql_load.cc
parentb94f191a776791e7a120c7e7829be4ffe8109823 (diff)
parentdb020fb30f56c1ec1b1e65304ad5a0830fddab34 (diff)
downloadmariadb-git-224108a19ec945ac1c3da6c5ec36b6777fd59444.tar.gz
Fixed problems in merge
mysql-test/r/information_schema.result: Fixed a result file. mysql-test/r/innodb-autoinc.result: Fixed a result file. mysql-test/t/connect.test: Fixed a problem with merge, needed to close connections and use the default
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 278e01d4de6..771aef33434 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -604,7 +604,7 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
}
it.rewind();
uchar *pos=read_info.row_start;
-#ifdef HAVE_purify
+#ifdef HAVE_valgrind
read_info.row_end[0]=0;
#endif