Merge 2.1.

This commit is contained in:
Daniel Nichter
2012-06-03 13:29:02 -04:00
551 changed files with 55822 additions and 9789 deletions

View File

@@ -250,10 +250,10 @@ is_deeply(
sample => "UPDATE foo.bar
SET biz = '91848182522'",
checksum => '12831241509574346332',
disk_filesort_cnt => '2',
disk_filesort_sum => '0',
disk_tmp_table_cnt => '2',
disk_tmp_table_sum => '0',
filesort_on_disk_cnt => '2',
filesort_on_disk_sum => '0',
tmp_table_on_disk_cnt => '2',
tmp_table_on_disk_sum => '0',
filesort_cnt => '2',
filesort_sum => '0',
full_join_cnt => '2',