diff options
author | unknown <hf@deer.mysql.r18.ru> | 2003-01-21 09:46:07 +0400 |
---|---|---|
committer | unknown <hf@deer.mysql.r18.ru> | 2003-01-21 09:46:07 +0400 |
commit | a109d180c15d8e2b7908cf7833ee2ea245ae18f0 (patch) | |
tree | 8b24c166544177198dcdcd0ca14516e5e3cd544f /sql/ha_innodb.cc | |
parent | 65aa88236cc1e310baa69cfed7281ce029859aed (diff) | |
parent | 3ffd7865b02a37569f955e40505f2f6b46cbe7a0 (diff) | |
download | mariadb-git-a109d180c15d8e2b7908cf7833ee2ea245ae18f0.tar.gz |
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1
sql/ha_innodb.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r-- | sql/ha_innodb.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index a6cf68b33b0..6e2b08005df 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2513,11 +2513,6 @@ ha_innobase::change_active_index( the flag ROW_MYSQL_WHOLE_ROW below, but that caused unnecessary copying. Starting from MySQL-4.1 we use a more efficient flag here. */ - /* - TODO: In 4.0 the below user_thd was changed to NULL. - Heikki, please delete this comment after you have read this and may - acted upon it. - */ build_template(prebuilt, user_thd, table, ROW_MYSQL_REC_FIELDS); DBUG_RETURN(0); |