diff options
author | unknown <monty@hundin.mysql.fi> | 2001-06-25 11:35:22 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-06-25 11:35:22 +0300 |
commit | 4d5dcac35ea0fc25632d17657b3f42af41bd2c7d (patch) | |
tree | c5dedde5af42a65776a3a0d1d3b949cad43a0d59 /sql/sql_table.cc | |
parent | 157c1bc5f948995697ca96fb100ea1657c7952c9 (diff) | |
download | mariadb-git-4d5dcac35ea0fc25632d17657b3f42af41bd2c7d.tar.gz |
Fixed bug when sorting big files (introduced with multi-table-delete)
Changed mysql-test to use --language
Cleaned up parameters to filesort()
configure.in:
Fixed typo
mysql-test/install_test_db.sh:
Changed test case to use --language
mysql-test/mysql-test-run.sh:
Changed test case to use --language
Fixed that test names are not 'cut'-ed.
mysql-test/r/select_found.result:
Fixed test case to make it repeatable
mysql-test/t/insert.test:
Added test of unique key handling
mysql-test/t/order_fill_sortbuf.test:
Cleaned up test
mysql-test/t/select_found.test:
Fixed test case to make it repeatable
sql/filesort.cc:
Fixed bug when sorting big files (introduced with multi-table-delete)
cleaned up parameters.
sql/mysql_priv.h:
Cleaned up parameters to filesort()
sql/mysqld.cc:
Fixed typo on enum
sql/sql_delete.cc:
Cleanup
sql/sql_select.cc:
Cleanup
sql/sql_table.cc:
Cleanup
sql/sql_test.cc:
Cleanup
sql/sql_update.cc:
Cleanup
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 3988a823e83..b755a4d6327 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1755,8 +1755,8 @@ copy_data_between_tables(TABLE *from,TABLE *to, if (setup_order(thd, &tables, fields, all_fields, order) || !(sortorder=make_unireg_sortorder(order, &length)) || - (from->found_records = filesort(&from, sortorder, length, - (SQL_SELECT *) 0, 0L, HA_POS_ERROR, + (from->found_records = filesort(from, sortorder, length, + (SQL_SELECT *) 0, 0L, HA_POS_ERROR, &examined_rows)) == HA_POS_ERROR) goto err; |