mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Fixed problem when comparing a key for a multi-byte-character set. (bug 152)
Use 0x.... as strings if 'new' mode. (bug 152) Don't report -max on windows when InnoDB is enabled. (bug 332) Reset current_linfo; This could cause a hang when doing PURGE LOGS. Fix for row numbers in EXPLAIN (bug 322) Fix that USE_FRM works for all table types (bug 97) VC++Files/libmysql/libmysql.dsp: Added new source files myisam/mi_key.c: Fixed problem when comparing a key for a multi-byte-character set. myisam/mi_range.c: Fixed problem when comparing a key for a multi-byte-character set. myisam/mi_rkey.c: Fixed problem when comparing a key for a multi-byte-character set. myisam/mi_search.c: Fixed problem when comparing a key for a multi-byte-character set. myisam/mi_test2.c: Fixed printf statements myisam/myisamdef.h: Fixed problem when comparing a key for a multi-byte-character set. myisam/sort.c: Fixed printf statements mysql-test/r/ctype_latin1_de.result: New test results mysql-test/r/join.result: New test results mysql-test/r/repair.result: New test results mysql-test/r/rpl_alter.result: New test results mysql-test/t/ctype_latin1_de-master.opt: --new is needed to get 0x... strings to work properly mysql-test/t/ctype_latin1_de.test: New test for latin1_de mysql-test/t/repair.test: Test of USE_FRM and HEAP tables sql/field.cc: Fixed problem when comparing a key for a multi-byte-character set. sql/item.cc: Use 0x.... as strings if 'new' mode sql/item.h: Use 0x.... as strings if 'new' mode sql/mysqld.cc: Don't report -max on windows when InnoDB is enabled. sql/sql_analyse.cc: Removed unused variable sql/sql_insert.cc: Removed debug message sql/sql_repl.cc: Reset current_linfo; This could cause a hang when doing PURGE LOGS. sql/sql_select.cc: Fix for row numbers in EXPLAIN sql/sql_table.cc: Fix that USE_FRM works for all table types (without strange errors) sql/sql_yacc.yy: Removed compiler warnings.
This commit is contained in:
parent
3e90ec6a58
commit
f22be77734
25 changed files with 274 additions and 62 deletions
|
|
@ -639,14 +639,14 @@ int main(int argc, char *argv[])
|
|||
if ((long) range_records < (long) records*7/10-2 ||
|
||||
(long) range_records > (long) records*14/10+2)
|
||||
{
|
||||
printf("mi_records_range for key: %d returned %ld; Should be about %ld\n",
|
||||
i, range_records, records);
|
||||
printf("mi_records_range for key: %d returned %lu; Should be about %lu\n",
|
||||
i, (ulong) range_records, (ulong) records);
|
||||
goto end;
|
||||
}
|
||||
if (verbose && records)
|
||||
{
|
||||
printf("mi_records_range returned %ld; Exact is %ld (diff: %4.2g %%)\n",
|
||||
range_records,records,
|
||||
printf("mi_records_range returned %lu; Exact is %lu (diff: %4.2g %%)\n",
|
||||
(ulong) range_records, (ulong) records,
|
||||
labs((long) range_records-(long) records)*100.0/records);
|
||||
|
||||
}
|
||||
|
|
@ -660,8 +660,8 @@ int main(int argc, char *argv[])
|
|||
|| info.keys != keys)
|
||||
{
|
||||
puts("Wrong info from mi_info");
|
||||
printf("Got: records: %ld delete: %ld i_keys: %d\n",
|
||||
info.records,info.deleted,info.keys);
|
||||
printf("Got: records: %lu delete: %lu i_keys: %d\n",
|
||||
(ulong) info.records, (ulong) info.deleted, info.keys);
|
||||
}
|
||||
if (verbose)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue