into  chilla.local:/home/mydev/mysql-5.1-bug24607


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-bug24607


mysql-test/t/myisam.test:
  Auto merged
mysql-test/r/myisam.result:
  Manual merged

After merge fix

into  chilla.local:/home/mydev/mysql-5.0-bug24607


mysql-test/r/myisam.result:
  Manual merged
mysql-test/t/myisam.test:
  Manual merged

Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.


mysql-test/r/myisam.result:
  Bug#24607 - MyISAM pointer size determined incorrectly
  Fixed test results.

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines

into  chilla.local:/home/mydev/mysql-4.1-bug24607


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-bug24607


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-bug24607

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines


storage/myisam/mi_open.c:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines


myisam/mi_open.c:
  Auto merged

into  xiphis.org:/home/antony/work2/p2-bug24270.3

into  chilla.local:/home/mydev/mysql-5.1-bug24607


mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

            corrupted table

Accessing a table with corrupted column definition results in server
crash.

This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.


myisam/mi_open.c:
  Refuse to open MyISAM table with summary columns length bigger than
  length of the record.

into  chilla.local:/home/mydev/mysql-5.1-bug24607


storage/myisam/mi_create.c:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-engines


mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-bug24607


myisam/mi_create.c:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.

into  chilla.local:/home/mydev/mysql-4.1-bug24607

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-engines


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged

Bug #25000  	myisam.test fails on 'pb-valgrind-*' Valgrind
 - Move tests that need symlink to symlink.test


mysql-test/r/myisam.result:
  - Move tests that need symlink to symlink.test
mysql-test/r/symlink.result:
  - Move tests that need symlink to symlink.test
mysql-test/t/myisam.test:
  - Move tests that need symlink to symlink.test
mysql-test/t/symlink.test:
  - Move tests that need symlink to symlink.test

mysql-test/r/myisam.result:
  Exclude
mysql-test/t/myisam.test:
  Exclude

mysql-test/r/myisam.result:
  Exclude
mysql-test/t/myisam.test:
  Exclude

into  mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.1-engines


storage/myisam/mi_open.c:
  Auto merged

into  mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines


myisam/mi_open.c:
  Auto merged

Accessing fixed record format table with crashed key definition results
in server/myisamchk segmentation fault.

This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.


myisam/mi_open.c:
  Refuse to open fixed record format table with key segment that includes
  BLOB part (which is true only for tables with crashed key definition).

The function mi_get_pointer_length() computed too small
pointer size for very large tables.

Inserted missing 'else' between the branches for very
large tables.


myisam/mi_create.c:
  Bug#24607 - MyISAM pointer size determined incorrectly
  Inserted missing 'else' between the branches for very
  large tables.
  Harmonized literals "(longlong) 1" and "1L" to "ULL(1)"
  where they are used for "ulonglong file_length".
mysql-test/r/myisam.result:
  Bug#24607 - MyISAM pointer size determined incorrectly
  Added the test result.
mysql-test/t/myisam.test:
  Bug#24607 - MyISAM pointer size determined incorrectly
  Added the test.

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/lock.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/lock.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_range.c:
  Auto merged
storage/myisam/mi_test1.c:
  Auto merged
storage/myisam/mi_update.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg


myisam/mi_dynrec.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_update.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged

  "mysql_install_db doesn't work properly on 5.1"
  force sql_mode to known value within initialization scripts


scripts/fill_help_tables.sh:
  force sql_mode to known value
scripts/mysql_create_system_tables.sh:
  force sql_mode to known value
scripts/mysql_fix_privilege_tables.sql:
  force sql_mode to known value

into  trift2.:/MySQL/M51/mysql-5.1