diff options
| author | unknown <brian@zim.(none)> | 2005-06-01 18:48:29 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-06-01 18:48:29 -0700 |
| commit | e2bf6b04a6d97a6680cd4deb653fc92e6604bfea (patch) | |
| tree | 6a69ff42d381e6dc38ff3518c762a6fdb7a8bb0c /sql/sql_insert.cc | |
| parent | e71ef9416f84922310f88c1cd7295334dadfeb68 (diff) | |
| parent | 0218ecf7af9bb7dee577ec01f42f602205ec3483 (diff) | |
| download | mariadb-git-e2bf6b04a6d97a6680cd4deb653fc92e6604bfea.tar.gz | |
Merge
sql/ha_heap.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_example.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_repl.cc:
SCCS merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index de3575dd856..b4021943967 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1443,7 +1443,7 @@ bool delayed_insert::handle_inserts(void) if (thd.killed || table->version != refresh_version) { thd.killed=1; - max_rows= ~0; // Do as much as possible + max_rows= ~(uint)0; // Do as much as possible } /* |