iangilfillan
f0ec34002a
Correct FSF address
2017-03-10 18:21:29 +01:00
Sergei Golubchik
a844635637
use PSI wrappers in aria and other non-MySQL code
2011-07-13 21:10:18 +02:00
Sergei Golubchik
0accbd0364
lots of post-merge changes
2011-04-25 17:22:25 +02:00
Sergei Golubchik
65ca700def
merge.
...
checkpoint.
does not compile.
2010-11-25 18:17:28 +01:00
unknown
d430e5bfc1
Fixed compiler warnings
...
Fixed wrong hash function prototype (causes failure on 64 bit systems)
mysql-test/r/rpl_events.result:
Removed wrong merge (result file is now identical as in 5.1 tree)
mysys/lf_hash.c:
Fixed compiler warning
mysys/my_safehash.c:
Fixed wrong hash function prototype (causes failure on 64 bit systems)
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
Fixed compiler warning
2007-08-22 10:56:10 +03:00
unknown
631ecaabea
Merged with mysql-5.1 main tree.
...
BUILD/compile-pentium-debug-max:
Added definition after macro was removed from main tree. This will
be fixed back in main tree later.
2007-07-02 20:45:15 +03:00
unknown
ee8f8dd128
Fixed dubug info.
...
sql/set_var.cc:
fixed parameters.
2007-04-18 14:45:32 +03:00
unknown
92e99ce424
Postmerge fixes.
...
added forgoten file.
The patch broke maria.test (will be fixed later)
sql/handler.cc:
Pagecache block should be equal maria block.
sql/mysqld.cc:
parameters Fixed.
storage/maria/ma_bitmap.c:
fixed typo.
storage/maria/ma_blockrec.c:
fixed typo.
storage/maria/ma_delete_all.c:
fixed typo.
storage/maria/ma_page.c:
fixed typo.
storage/maria/ma_pagecache.c:
pin/lock debugging protection activated by default.
storage/maria/ma_pagecaches.c:
parameters Fixed.
storage/maria/ma_preload.c:
fixed typo.
mysys/my_safehash.c:
New BitKeeper file ``mysys/my_safehash.c''
2007-04-18 12:55:09 +03:00