bzr push into mysql-6.0-maria branch (serg:2709)

[Sergei Golubchik]

 2709 Sergei Golubchik	2009-02-09 [merge]
      merged
removed:
  include/lf.h.moved
  include/my_bit.h.moved
  mysys/lf_alloc-pin.c.moved
  mysys/lf_dynarray.c.moved
  mysys/lf_hash.c.moved
  win/build-vs9.bat.moved
  win/build-vs9_x64.bat.moved
added:
  mysql-test/include/have_myisam_or_maria_default.inc
  mysql-test/suite/backup/r/backup_maria.result
  mysql-test/suite/backup/r/backup_maria_other_instance.result
  mysql-test/suite/backup/t/backup_maria.test
  mysql-test/suite/backup/t/backup_maria_other_instance.test
  storage/maria/ma_examine_non_trans_log.c
  storage/maria/ma_non_trans_log.c
  storage/maria/maria_backup_engine.cc
  storage/maria/maria_non_trans_log.c
renamed:
  mysql-test/r/maria_mrr.result => mysql-test/suite/maria/r/maria_mrr.result
  mysql-test/t/maria_mrr.test => mysql-test/suite/maria/t/maria_mrr.test
modified:
  .bzrignore
  configure.in
  include/maria.h
  include/myisam.h
  mysql-test/lib/mtr_report.pl
  mysql-test/mysql-test-run.pl
  mysql-test/suite/backup/r/backup.result
  mysql-test/suite/backup/r/backup_commit_backup.result
  mysql-test/suite/backup/r/backup_default.result
  mysql-test/suite/backup/r/backup_lock_myisam.result
  mysql-test/suite/backup/r/backup_logs.result
  mysql-test/suite/backup/r/backup_logs_purge.result
  mysql-test/suite/backup/r/backup_multi_blocks.result
  mysql-test/suite/backup/r/backup_myisam1.result
  mysql-test/suite/backup/r/backup_myisam2.result
  mysql-test/suite/backup/r/backup_no_be.result
  mysql-test/suite/backup/r/backup_objects.result
  mysql-test/suite/backup/t/backup.test
  mysql-test/suite/backup/t/backup_commit_backup.test
  mysql-test/suite/backup/t/backup_ddl_blocker.test
  mysql-test/suite/backup/t/backup_default.test
  mysql-test/suite/backup/t/backup_lock_myisam.test
  mysql-test/suite/backup/t/backup_logs.test
  mysql-test/suite/backup/t/backup_logs_purge.test
  mysql-test/suite/backup/t/backup_multi_blocks.test
  mysql-test/suite/backup/t/backup_myisam1.test
  mysql-test/suite/backup/t/backup_myisam2.test
  mysql-test/suite/backup/t/backup_no_be.test
  mysql-test/suite/backup/t/backup_no_data.test
  mysql-test/suite/backup/t/backup_no_engine.test
  mysql-test/suite/backup/t/backup_objects.test
  mysql-test/suite/funcs_1/t/disabled.def
  mysql-test/suite/maria/t/maria-lock.test
  sql/backup/backup_info.cc
  sql/backup/backup_kernel.h
  sql/backup/kernel.cc
  sql/debug_sync.cc
  sql/opt_range.cc
  sql/protocol.cc
  sql/sql_select.cc
  storage/falcon/TransformLib/StringTransform.cpp
  storage/maria/CMakeLists.txt
  storage/maria/Makefile.am
  storage/maria/ha_maria.cc
  storage/maria/ha_maria.h
  storage/maria/ma_bitmap.c
  storage/maria/ma_check.c
  storage/maria/ma_check_standalone.h
  storage/maria/ma_checkpoint.c
  storage/maria/ma_close.c
  storage/maria/ma_create.c
  storage/maria/ma_delete.c
  storage/maria/ma_delete_all.c
  storage/maria/ma_dynrec.c
  storage/maria/ma_extra.c
  storage/maria/ma_ft_update.c
  storage/maria/ma_init.c
  storage/maria/ma_locking.c
  storage/maria/ma_loghandler.c
  storage/maria/ma_open.c
  storage/maria/ma_pagecache.c
  storage/maria/ma_pagecache.h
  storage/maria/ma_pagecrc.c
  storage/maria/ma_recovery.c
  storage/maria/ma_static.c
  storage/maria/maria_chk.c
  storage/maria/maria_def.h
  storage/maria/maria_pack.c
  storage/maria/unittest/ma_pagecache_consist.c
  storage/maria/unittest/ma_pagecache_rwconsist.c
  storage/maria/unittest/ma_pagecache_rwconsist2.c
  storage/maria/unittest/ma_pagecache_single.c
  storage/maria/unittest/ma_test_loghandler_pagecache-t.c
  storage/myisam/mi_close.c
  storage/myisam/mi_create.c
  storage/myisam/mi_delete.c
  storage/myisam/mi_open.c
  storage/myisam/mi_update.c
  storage/myisam/mi_write.c
  storage/myisam/myisam_backup_engine.cc

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-12-15 11:30:57 +0000
+++ b/.bzr-mysql/default.conf	2009-02-09 20:32:20 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-maria
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-6.0"
+tree_name = "mysql-6.0-maria"

=== modified file 'sql/scheduler.cc'
--- a/sql/scheduler.cc	2008-10-17 17:47:16 +0000
+++ b/sql/scheduler.cc	2009-01-12 12:10:57 +0000
@@ -581,6 +581,8 @@ pthread_handler_t libevent_thread_proc(v
 
     /* set up the thd<->thread links. */
     thd->thread_stack= (char*) &thd;
+    thd->mysys_var->stack_ends_here= thd->thread_stack +
+                                     STACK_DIRECTION * (long)my_thread_stack_size;
 
     if (thd->scheduler.thread_attach())
     {

=== modified file 'storage/maria/ma_state.c'
--- a/storage/maria/ma_state.c	2008-12-09 12:36:51 +0000
+++ b/storage/maria/ma_state.c	2009-01-12 13:04:54 +0000
@@ -91,7 +91,7 @@ my_bool _ma_setup_live_state(MARIA_HA *i
     It's enough to compare trids here (instead of calling
     tranman_can_read_from) as history->trid is a commit_trid
   */
-  while (trn->trid < history->trid && history->trid != ~(TrID)0)
+  while (trn->trid < history->trid)
     history= history->next;
   pthread_mutex_unlock(&share->intern_lock);
   /* The current item can't be deleted as it's the first one visible for us */