Commit graph

53278 commits

Author SHA1 Message Date
unknown
f93bfec8f2 have to disable test until bug is fixed 2008-03-04 18:03:31 +01:00
unknown
c32e663dfe fix for compilation failure in non-debug builds
sql/mysqld.cc:
  option -# and --debug, and default_dbug_option, do not exist in non-debug builds
2008-03-04 18:00:59 +01:00
unknown
33c253534a Merge gbichot4.local:/home/mysql_src/mysql-maria-monty
into  gbichot4.local:/home/mysql_src/mysql-maria-clean


storage/maria/ha_maria.cc:
  Auto merged
storage/maria/ma_pagecache.c:
  Auto merged
2008-03-04 17:16:23 +01:00
unknown
29b9fdff4b Making ma_pagecache_rwconsist_1k-t unit test build under Windows
storage/maria/unittest/CMakeLists.txt:
  build unit test under Windows too
storage/maria/unittest/ma_pagecache_rwconsist.c:
  portability fix for Windows
2008-03-04 17:07:55 +01:00
unknown
09e4e954c3 Fixed crashing bug when starting mysqld with --dbug
Fixed crash when using other maria block size than 8192
Fixed bug that caused tables to be reported as crashed if maria_log_control was deleted


mysql-test/valgrind.supp:
  Suppress leaks on SuSE 10.3, x86 64 bit
sql/mysqld.cc:
  Don't give warning in case of timeout for pthread_cond_timedwait
  Fixed crashing bug when starting mysqld with --dbug
storage/maria/ha_maria.cc:
  Fixed crash when using other block size than 8192 (Crash happend later in bitmap page handling)
storage/maria/ma_locking.c:
  When we write a new uuid for a zerofilled file, also update the lsn's
storage/maria/ma_open.c:
  Don't update lsn on open. Wait until first time file is changed
  Fixed bug that caused tables to be reported as crashed if maria_log_control was deleted
strings/strmake.c:
  Fixed warnings for strings without end 0 when running under valgrind.
2008-03-04 17:13:34 +02:00
unknown
ea3ae3c470 copyright and license info
storage/maria/Makefile.am:
  copyright
storage/maria/ma_pagecache.c:
  copyright
storage/maria/ma_pagecache.h:
  copyright
storage/maria/ma_pagecaches.c:
  copyright
storage/maria/ma_pagecrc.c:
  copyright
storage/maria/unittest/Makefile.am:
  copyright
storage/maria/unittest/lockman-t.c:
  copyright
storage/maria/unittest/lockman1-t.c:
  copyright
storage/maria/unittest/lockman2-t.c:
  copyright
storage/maria/unittest/ma_control_file-t.c:
  copyright
storage/maria/unittest/ma_loghandler_examples.c:
  copyright
storage/maria/unittest/ma_maria_log_cleanup.c:
  copyright
storage/maria/unittest/ma_pagecache_consist.c:
  copyright
storage/maria/unittest/ma_pagecache_rwconsist.c:
  copyright
storage/maria/unittest/ma_pagecache_single.c:
  copyright
storage/maria/unittest/ma_test_loghandler-t.c:
  copyright
storage/maria/unittest/ma_test_loghandler_first_lsn-t.c:
  copyright
storage/maria/unittest/ma_test_loghandler_max_lsn-t.c:
  copyright
storage/maria/unittest/ma_test_loghandler_multigroup-t.c:
  copyright
storage/maria/unittest/ma_test_loghandler_multithread-t.c:
  copyright
storage/maria/unittest/ma_test_loghandler_noflush-t.c:
  copyright
storage/maria/unittest/ma_test_loghandler_nologs-t.c:
  copyright
storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
  copyright
storage/maria/unittest/ma_test_loghandler_purge-t.c:
  copyright
storage/maria/unittest/test_file.c:
  copyright
storage/maria/unittest/test_file.h:
  copyright
storage/maria/unittest/trnman-t.c:
  copyright
2008-03-04 12:58:21 +01:00
unknown
1bbb098104 Fix for BUG#34089 "Maria crash on LOAD INDEX after FLUSH TABLES".
storage/maria/ha_maria.cc:
  enable LOAD INDEX for Maria
storage/maria/ma_preload.c:
  Making index preloading work for Maria.
storage/maria/maria_def.h:
  We don't need this #define anymore, ma_test_recovery.pl uses
  zerofill to do comparisons of physical files.
mysql-test/r/maria-preload.result:
  result. The values of maria_pagecache_reads look too high, see
  BUG#35030 "maria_pagecache_read* status variables updated at wrong moment"
mysql-test/t/maria-preload.test:
  Test of index preloading in Maria
2008-03-04 12:47:02 +01:00
unknown
79ca1004cb Merge bk-internal.mysql.com:/home/bk/mysql-maria
into  mysql.com:/home/my/mysql-maria
2008-03-04 02:46:51 +02:00
unknown
77dec6470c Incorrect function prefix fixed. (thanks Guilhem for spotting it)
storage/maria/ma_pagecache.c:
  Incorrect function prefix fixed.
2008-03-03 23:29:44 +02:00
unknown
7184124a2e configure.in:
And back to 5.1.24


configure.in:
  And back to 5.1.24
2008-03-02 04:58:50 +01:00
unknown
6239bc61ae Merge bk-internal:/home/bk/mysql-maria
into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release
2008-03-02 04:39:48 +01:00
unknown
6e71829eb3 Fix for BUG#34936 "Table can stay locked if writing of LOGREC_FILE_ID fails"
storage/maria/ma_loghandler.c:
  forgotten unlock
2008-02-29 12:11:31 +01:00
unknown
b01c9528d1 WL#3072 Maria Recovery
fixes for ma_test_recovery.pl to work in release builds too:
- bugfix in maria_zerofill_index()
- applying of LOGREC_INSERT_ROW_BLOBS now zeroes unused end of non-full
blob page (a mutation of tail page when it takes >75% of maria_block_size)
like write_full_pages() does.


storage/maria/ma_blockrec.c:
  When we write a non-full blob page at run-time, we zero the rest of
  it (see write_full_pages()). We now do the same in
  _ma_apply_redo_insert_row_blobs(): this is consistent and helps
  having log-applying produce the same page as run-time.
storage/maria/ma_check.c:
  maria_zerofill_index() was wrong: it didn't zero certain bytes
  because it believed that the count of relevant bytes is
  _ma_get_page_used(share, buff) + share->keypage_header,
  whereas it's only the first term.
storage/maria/ma_pagecache.c:
  typo
storage/maria/ma_pagecache.h:
  typo
storage/maria/maria_chk.c:
  enable --zerofill-keep-lsn in all builds
storage/maria/unittest/ma_test_recovery.pl:
  now even release builds can run ma_test_recovery.pl, because zerofill
  makes tables of this test (made by run-time and by log-applying)
  identical.
2008-02-26 21:32:07 +01:00
unknown
b2724a6a94 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-maria
into  desktop.sanja.is.com.ua:/home/bell/tmp/work-maria-rwlock-push
2008-02-26 01:09:49 +02:00
unknown
446c13a801 Fixes to how ma_test_recovery.pl uses --zerofill-keep-lsn
storage/maria/unittest/ma_test_recovery.pl:
  Tell how many tables were zerofilled (just for information, a varying
  number does not make the test fail).
  Don't let --zerofill-keep-lsn influence next runs (which it shouldn't
  do in theory anyway, but testing should not believe theory): restore
  non-zerofilled tables right after comparison is finished.
2008-02-25 23:46:01 +01:00
unknown
c45172ec38 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-maria
into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-rwlock-push
2008-02-26 00:07:40 +02:00
unknown
a998e0dc0c Removing from circular list fixed.
mysys/wqueue.c:
  fixed removing from circular list.
2008-02-25 23:32:16 +02:00
unknown
c0356dad39 No error message from maria_dump_log when reaching a log's EOF.
storage/maria/ma_loghandler.c:
  change the flags, otherwise when maria_dump_log reaches the end of the
  log it prints an "EOF error" to the user.
2008-02-25 19:43:58 +01:00
unknown
1b4c6fa6df Build maria_dump_log under Windows. Enable maria_chk --zerofill-keep-lsn
in release builds, use it to fine-tune physical file comparisons in
ma_test_recovery.pl.


storage/maria/CMakeLists.txt:
  build maria_dump_log under Windows too
storage/maria/maria_chk.c:
  make --zerofill-keep-lsn usable in release builds too, it makes sense.
  This option needn't reset state's LSNs, and it's more useful if it
  does not (see added comment) as it changes less the table.
storage/maria/unittest/ma_test_recovery.pl:
  - getting rid of 'cmp'
  - if physical comparison of two MAD or MAI files fails, it might
  be in irrelevant portions (unushed index or data page pieces):
  we use --zerofill-keep-lsn and retry the comparison. This fixes
  a part of test failures under Windows.
2008-02-25 17:31:55 +01:00
unknown
e6349ff7f3 postmerge fix
storage/maria/unittest/ma_pagecache_consist.c:
  postmerge fix.
storage/maria/unittest/ma_pagecache_rwconsist.c:
  postmerge fix.
2008-02-22 23:35:38 +02:00
unknown
daacf696e5 Merge 88-214-96-46.dialup.umc.net.ua:/Users/bell/mysql/bk/mysql-maria
into  88-214-96-46.dialup.umc.net.ua:/Users/bell/mysql/bk/work-maria-test


storage/maria/ma_pagecache.c:
  Auto merged
storage/maria/unittest/Makefile.am:
  merge
storage/maria/unittest/ma_pagecache_consist.c:
  merge
2008-02-22 23:21:27 +02:00
unknown
190de95f6f Locking for read and write made waiting for each other (with loose
scheme for the same thread locking).


include/my_pthread.h:
  Added variable for lock diffirentiation.
include/wqueue.h:
  New release call.
mysys/wqueue.c:
  New release call in case of read/write lock.
storage/maria/ma_pagecache.c:
  Locking for read and write made waitimg for each other.
storage/maria/unittest/Makefile.am:
  New test added.
storage/maria/unittest/ma_pagecache_consist.c:
  Fixed thread initialization in the test.
storage/maria/unittest/ma_pagecache_rwconsist.c:
  New BitKeeper file ``storage/maria/unittest/ma_pagecache_rwconsist.c''
2008-02-22 22:32:34 +02:00
unknown
5950020d8b Merge bk-internal.mysql.com:/home/bk/mysql-maria
into  mysql.com:/home/my/mysql-maria
2008-02-22 17:23:30 +02:00
unknown
a38693a261 Fixed compiler warnings
strings/bmove512.c:
  Fixed typo (Serious for systems that doesn't have longlong, but apparently we don't have theese...)
storage/maria/file_formats.txt:
  Description of file formats (for now, only the header of the index file)
2008-02-22 17:22:56 +02:00
unknown
1dfeb4783f update to "KNOWN BUGS"
KNOWN_BUGS.txt:
  update
2008-02-22 14:32:20 +01:00
unknown
83d331a553 Small fixes; the missing DBUG_RETURN() fixes
BUG#34741 "prepared show master logs without binlogging debug assert"


sql/sql_repl.cc:
  missing DBUG_RETURN
storage/maria/unittest/ma_control_file-t.c:
  fix for icc warning.
2008-02-22 14:31:37 +01:00
unknown
7d862953e6 mysql.spec.sh:
Added --with-maria and maria support


support-files/mysql.spec.sh:
  Added --with-maria and maria support
2008-02-21 23:34:22 +01:00
unknown
def85d3564 Merge bk-internal:/home/bk/mysql-maria
into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release
2008-02-21 23:25:31 +01:00
unknown
b9b60d6f2d Fixes for ma_test_recovery.pl on OS X.
storage/maria/unittest/ma_test_recovery.pl:
  .exe is for win32, win64, cygwin but not darwin.
  Some OS X machines have md5 instead of md5sum.
2008-02-21 23:15:37 +01:00
unknown
b35c0fbc0d Make ma_test_all-t find its eggs on Darwin machines.
storage/maria/unittest/ma_test_all-t:
  .exe is for win32, win64, cygwin, but not darwin
2008-02-21 23:05:27 +01:00
unknown
e068ad620b fix for bug in Solaris 10 Sparc 64 bit (misaligned buffer in the
log handler).


storage/maria/ma_loghandler.c:
  Buffers on the stack must be properly aligned as pagecache_read()
  will use bmove512() on them. Fixes hang in maria-recovery.test
  on Solaris 10 Sparc 64 bit.
storage/maria/ma_pagecache.c:
  comment
2008-02-21 22:43:00 +01:00
unknown
203c0feda6 configure.in:
Set back to 5.1.23a-maria-alpha


configure.in:
  Set back to 5.1.23a-maria-alpha
2008-02-21 02:47:53 +01:00
unknown
33c24d59f4 Merge bk-internal.mysql.com:/home/bk/mysql-maria
into  mysql.com:/home/my/mysql-maria


dbug/dbug.c:
  Auto merged
mysys/lf_alloc-pin.c:
  Auto merged
storage/maria/lockman.c:
  Auto merged
storage/maria/ma_open.c:
  Auto merged
storage/maria/ma_recovery.c:
  Auto merged
storage/maria/unittest/ma_test_recovery.pl:
  Manual merge
2008-02-21 02:51:51 +02:00
unknown
df843c4ce2 Fixed problems with ma_test2 and mi_test2 on high-byte-first system
Fixed bug in ma_test2 when last row in table is deleted
Fixed that ma_test_recovery.pl works on Solaris (by using digest instead of md5sum)
Fixed some compiler warnings generated by the Forte compiler


dbug/dbug.c:
  Added cast to get rid of compiler warning
mysys/lf_alloc-pin.c:
  Added cast to get rid of compiler warning
mysys/my_bitmap.c:
  Removed impossible DBUG_ASSERT()'s to get rid of compiler warnings
mysys/my_compress.c:
  Removed wrong cast to get rid of compiler warning
storage/maria/lockman.c:
  Added cast to get rid of compiler warning
storage/maria/ma_open.c:
  Added fix from MyISAM to allocate space in key buffer for nod pointer
storage/maria/ma_recovery.c:
  Fixed initialization that caused compiler warning
storage/maria/ma_rsame.c:
  More DBUG_PRINT
storage/maria/ma_scan.c:
  Better comment
storage/maria/ma_statrec.c:
  More DBUG_PRINT and comments
  Fixed indentation
BitKeeper/etc/ignore:
  added storage/maria/unittest/tmp/*
storage/maria/ma_test2.c:
  Fixed bug that caused maria_rsame() to fail if test removed last row
  Fixed wrong usage of longget();  Should be uint4korr()
storage/maria/unittest/ma_test_recovery.pl:
  Use md5sum or digest to calculate md5.
  This allows this script to be run on Linux and Solaris
storage/myisam/mi_test2.c:
  Fixed wrong usage of longget();  Should be uint4korr()
strings/ctype.c:
  Added casts to get rid of compiler warnings
sql-bench/myisam.cnf:
  New BitKeeper file ``sql-bench/myisam.cnf''
2008-02-21 02:45:02 +02:00
unknown
2e5a7aadc6 non-debug build should not cause ma_test_all-t to always fail:
make ma_test_recovery.pl return 0 if it skips itself.


storage/maria/unittest/ma_test_recovery.pl:
  non-debug build should not cause ma_test_all-t to always fail
2008-02-20 21:37:03 +01:00
unknown
81d7eb74a2 Working around tar's 99-char limit in file names
configure.in:
  this tree has version 5.1.23, release clone has version 5.1.23a-maria-alpha;
  it mostly matters because it makes the file's name 1 byte shorter
  and thus below tar's 99-chars limit...
2008-02-20 20:12:34 +01:00
unknown
1bb6196e3c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-maria
into  gbichot4.local:/home/mysql_src/mysql-maria-monty
2008-02-20 18:02:48 +01:00
unknown
29ee9e6f76 need to include ma_test_all-t and ma_test_recovery.* into the source
tarball, so that those tests are run on all platforms.
2008-02-20 18:01:59 +01:00
unknown
4ab90ef208 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria
into  hynda.mysql.fi:/home/my/mysql-maria
2008-02-20 18:42:45 +02:00
unknown
00fb84d2ab New version of ma_test_recovery.pl
storage/maria/ma_test_recovery:
  Made the shell version empty to avoid modifying
  files in two places. Linked to the current one.
storage/maria/unittest/ma_test_recovery.pl:
  New version of ma_test_recovery.pl
  Added --help and --version, made a function
  of the main part, removed all calls to unix
  mv and cp
2008-02-20 18:42:12 +02:00
unknown
788b95bc72 Fixes for bugs (my_atomic and Maria log handler) observed on
Solaris 10 Sparc 64bit.


include/my_atomic.h:
  Prototypes in the non-inline (extern) case were wrong: they were
  missing "U_a" i.e. "volatile *". Caused a segfault in my_atomic-t
  on Solaris10 Sparc 64.
storage/maria/ma_loghandler.c:
  Move "buffer" array up in the struct, to get it aligned on long-boundary
  so that page cache can use bmove512() (it was not aligned and bmove512()
  was used, causing SIGBUS on Solaris10 Sparc 64).
storage/maria/unittest/ma_pagecache_consist.c:
  doing *(uint*)(charbuff)=something is not ok on sparc machines, we must
  use int4store/uint4korr. Fixes a SIGBUS on Solaris10 Sparc 64.
2008-02-20 16:58:43 +01:00
unknown
eeb2ec1691 ha_maria.cc:
Adjust to match storage engine API, 'mysql_var_update_func' function
  prototype changed so that last argument now "void *save" with "const"


storage/maria/ha_maria.cc:
  Adjust to match storage engine API, 'mysql_var_update_func' function
  prototype changed so that last argument now "void *save" with "const"
2008-02-20 01:51:17 +01:00
unknown
0000ef5ed8 Merge bk-internal:/home/bk/mysql-maria
into  mysql.com:/data0/mysqldev/my/build-200802121236-5.1.23a-maria-alpha/mysql-5.1-release
2008-02-19 23:27:00 +01:00
unknown
4a05e13d17 Merge xiphis.org:/anubis/antony/work/p1-bug34598.2
into  xiphis.org:/anubis/antony/work/p1-bug34598.2.merge.maria


include/mysql/plugin.h:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
2008-02-19 14:01:08 -08:00
unknown
a1915039e8 Bug#34598
"crash on hpita: Invalid address alignment"
  Replace dangerous pointer arithmetic - it may occurr where sizeof(int) is
  less than size of machine alignment requirement.


include/mysql/plugin.h:
  bug34598
    change of update func prototype
sql/sql_plugin.cc:
  bug34598
    Avoid dangerous pointer arithmetic which can cause unaligned word access.
    Change of update function prototype
2008-02-19 12:55:13 -08:00
unknown
4c4f1ebb43 Fix for build failure
libmysql/get_password.c:
  fix for build failure (no bool in C)
2008-02-19 18:07:39 +01:00
unknown
8665ae2c1f Fix for build failures. Putting back "#define bool BOOL" under Windows
until Windows team confers.


client/get_password.c:
  fix for build failure (HPUX etc): no bool in C
dbug/dbug.c:
  typo
include/config-win.h:
  putting back the infamous #define, because without it we have 650
  distinct compiler warnings "forcing value to bool 'true' or 'false'"
  (C4800), Windows team will confer on what to do.
include/thr_alarm.h:
  fix for build failure on Windows
libmysql/dll.c:
  fix for build failure on Windows
mysys/thr_alarm.c:
  fix for build failure on HPUX
2008-02-19 11:41:12 +01:00
unknown
a680bc7688 dbug.c:
SCCS merged


dbug/dbug.c:
  SCCS merged
2008-02-19 09:32:10 +01:00
unknown
b369f21b7b Fix for failure of ma_test_loghandler_long-t on Windows
dbug/dbug.c:
  importing change from 6.0, which speeds up --debug on Windows (no sync)
storage/maria/unittest/ma_test_loghandler-t.c:
  this test needs ~80 open files (logs)
2008-02-19 09:25:31 +01:00
unknown
ce278d3a82 Merge mysql.com:/home/kent/bk/maria/mysql-maria
into  mysql.com:/home/kent/bk/maria/mysql-5.1-maria-alpha-release
2008-02-19 00:12:20 +01:00