especially for MySQL Cluster Carrier Grade Edition
BUILD/build_mccge.sh:
BitKeeper file /home/mikael/mysql_clones/mysql-5.1-engines/BUILD/build_mccge.sh
BUILD/check-cpu:
Added comments
Added support for Core 2 cpu's
Fixed some bad styles for scripts
Fixed some copy-paste bug
Added support for i386 from Mac OS X
Added support for Itanium
Added support for Sparc
Added support for GCC 4.2+
Fixed some issues with later change of cpu_arg
Removed some broken, unnecessarily complex parts
to find native compiler flags
Pre push fix:
added --sorted_result for consistent results
mysql-test/suite/parts/inc/partition_bit.inc:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_innodb.result:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
mysql-test/suite/parts/r/partition_bit_myisam.result:
Bug#34225: suite/parts test failure
added --sorted_result for consistent results
into witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
mysql-test/r/partition_datatype.result:
Auto merged
mysql-test/t/partition_datatype.test:
Auto merged
Problem was incorrect data length in the key_restore function
resulting in overwriting the search key.
Solution, remove one byte in length if uneven bits are used.
mysql-test/r/partition_datatype.result:
Bug#34358: Cannot find specified bit row
Updated result file
mysql-test/t/partition_datatype.test:
Bug#34358: Cannot find specified bit row
Updated test file
(corrected a few errors and added a test case for the bug)
sql/key.cc:
Bug34358: error in key_restore for bit fields with uneven bits
When uneven bits exist, it has special treatment for the uneven bits
but does use the same byte again when copying the rest of
the key_part.
Problem was that Field_bit used Field::hash() function that did not
know about using null-byte for storing bits.
Resulting in wrong length, which was caught by valgrind.
Solution: created a Field_bit::hash() that uses Field_bit::val_int()
and my_charset_bin-collation function hash_sort.
Also use the store function for platform independs
mysql-test/r/partition_datatype.result:
Bug#33379: valgrind error in parts/partition_bit_myisam
result file
enabled bit datatype test
mysql-test/t/partition_datatype.test:
Bug#33379: valgrind error in parts/partition_bit_myisam
test file
enabled bit datatype test
sql/field.cc:
Bug#33379: valgrind error in parts/partition_bit_myisam
Problem was that Field_bit used Field::hash() function that did not
know about using null-byte for storing bits.
Resulting in wrong length.
Solution: created a Field_bit::hash() that uses Field_bit::val_int()
and my_charset_bin-collation function hash_sort.
Also use the store function for platform independens.
sql/field.h:
Bug#33379: valgrind error in parts/partition_bit_myisam
Problem was that Field_bit used Field::hash() function that did not
know about using null-byte for storing bits.
Resulting in wrong length.
Solution: created a Field_bit::hash().
After changes to the bug fix for bug 26379 (Combination of FLUSH
TABLE and REPAIR TABLE corrupts a MERGE table) the test case
merge-big failed.
Repaired the test case.
Removed tests for INSERT ... SELECT, which is disabled for MERGE.
Test case change only.
mysql-test/r/merge-big.result:
Bug#34376 - merge-big test fails
Removed result for removed tests.
mysql-test/t/merge-big.test:
Bug#34376 - merge-big test fails
Repaired the test case.
Removed tests for INSERT ... SELECT, which is disabled for MERGE.
Since it used /tmp-dir, it continues to fail on the same server
until the /tmp-dir is cleaned. (Another problem was that it
uses DATA/INDEX DIR without checking for symlink, which is needed)
Solution:
Moved all DATA/INDEX DIR test to a new partition_basic_symlink.inc file
and use this for myisam and innodb, also requiring symlinks and
not_windows.
(i.e. removed DATA/INDEX DIR use from several tests)
mysql-test/suite/parts/inc/partition_basic.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_bigint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_binary.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_bit.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_blob.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_char.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_date.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_datetime.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_decimal.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_double.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_enum.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_float.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_int.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_16col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_32col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_4col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_key_8col.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_mediumint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_set.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_smallint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_text.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_time.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_timestamp.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_tinyint.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_varbinary.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_varchar.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_year.inc:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_basic_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_basic_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_bit_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_bit_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_char_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_char_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_datetime_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_datetime_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_decimal_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_decimal_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_float_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_float_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_int_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_int_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_special_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/r/partition_special_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/t/partition_sessions.test:
Bug#34225: test suit parts uses /tmp-dir
Removed the DATA/INDEX DIR, since the test is not dependent of it
(adding "--source include/have_symlink.inc" would have disabled it
on some platforms/configurations)
mysql-test/suite/parts/inc/partition_basic_symlink.inc:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/r/partition_basic_symlink_innodb.result:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/t/partition_basic_symlink_innodb.test:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
mysql-test/suite/parts/t/partition_basic_symlink_myisam.test:
Bug#34225: test suit parts uses /tmp-dir
Added this test case for testing some DATA/INDEX DIRECTORY cases
since I removed so much of it from all other tests.
'Wrong parameters to functi
START SLAVE reports vague error when it fails to register on master:
"Wrong parameters to function register_slave".
If master failed to register slave because of too long
'report-host'/'report-user'/'report-password', return better error
messages:
"Failed to register slave: too long 'report-host'"
"Failed to register slave: too long 'report-user'"
"Failed to register slave; too long 'report-password'"
No test case for this fix.
sql/repl_failsafe.cc:
Report descriptive error when master fails to register slave.
into stella.local:/home2/mydev/mysql-5.1-axmrg
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_open.c:
Auto merged
mysql-test/r/partition.result:
New test case to validate that '/' is no longer allowed,
only integer division is allowed
mysql-test/t/partition.test:
New test case to validate that '/' is no longer allowed,
only integer division is allowed
sql/item_func.h:
+,-,*, mod is allowed
/ is disallowed
mysql-test/r/partition_range.result:
Added new test cases
mysql-test/t/partition_range.test:
Added new test cases
sql/sql_partition.cc:
Added check that last partition hasn't got maxvalue defined when
executing ADD PARTITION
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/r/mysqlcheck.result:
Use local (manual merge)
mysql-test/t/mysqlcheck.test:
Use local (manual merge)
and so that it works correctly on Windows.
mysql-test/r/mysqlcheck.result:
Flush tables before monkeying around with underlying MyISAM data files
mysql-test/t/mysqlcheck.test:
Fix the test case for bug #25347 so that it actually does test the behavior.
Also, this makes it work on Windows by ensuring that mysqld doesn't hold the
underlying MyISAM files open while we try to corrupt them on disk.
Flush tables before monkeying around with underlying MyISAM data files;
--use-frm, so that mysqlcheck will succeed.
mysql-test/t/plugin_load-master.opt:
add '--loose' modifier to allow test to be skipped if plugin is not available.
sql/sql_plugin.cc:
Failure to load a plugin from command line option made non-fatal as plugin
load failures from plugin table is already non-fatal.
"Plugin enum variables can't be set from command line"
fix crash of LOCK_plugins mutex when loading plug-ins from command line.
fix off-by-one bug when loading multiple plug-ins from the command line.
initialize command line handling for ENUM and SET plugin variable types.
sql/sql_plugin.cc:
Bug33358
fix crash of LOCK_plugins mutex when loading plug-ins from command line.
fix off-by-one bug when loading multiple plug-ins from the command line.
initialize command line handling for ENUM and SET plugin variable types.
mysql-test/r/plugin_load.result:
New BitKeeper file ``mysql-test/r/plugin_load.result''
mysql-test/t/plugin_load-master.opt:
New BitKeeper file ``mysql-test/t/plugin_load-master.opt''
mysql-test/t/plugin_load.test:
New BitKeeper file ``mysql-test/t/plugin_load.test''
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/handler.cc:
Manual merge
sql/item.cc:
Manual merge
myisamchk did always show Character set: latin1_swedish_ci (8),
regardless what DEFAULT CHARSET the table had.
When the server created a MyISAM table, it did not copy the
characterset number into the MyISAM create info structure.
Added assignment of charset number to MI_CREATE_INFO.
mysql-test/r/myisam.result:
Bug#29182 - MyISAMCHK reports wrong character set
Added test result.
mysql-test/t/myisam.test:
Bug#29182 - MyISAMCHK reports wrong character set
Added test.
storage/myisam/ha_myisam.cc:
Bug#29182 - MyISAMCHK reports wrong character set
Added assignment of charset number to MI_CREATE_INFO.
into quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-33618
mysql-test/r/sp-code.result:
Auto merged
mysql-test/t/sp-code.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sp_rcontext.cc:
Auto merged
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
mysql-test/t/sp.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
The server used to crash when REPEAT or another control instruction
was used in conjunction with labels and a LEAVE instruction.
The crash was caused by a missing "pop" of handlers or cursors in the
code representing the stored program. When executing the code in a loop,
this missing "pop" would result in a stack overflow, corrupting memory.
Code generation has been fixed to produce the missing h_pop/c_pop
instructions.
Also, the logic checking that labels at the beginning and the end of a
statement are matched was incorrect, causing Bug 33983.
End labels, when used, must match the label used at the beginning of a block.
mysql-test/r/sp-code.result:
Bug#33618 (Crash in sp_rcontext)
mysql-test/r/sp-error.result:
Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
mysql-test/r/sp.result:
Bug#33618 (Crash in sp_rcontext)
mysql-test/t/sp-code.test:
Bug#33618 (Crash in sp_rcontext)
mysql-test/t/sp-error.test:
Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)
mysql-test/t/sp.test:
Bug#33618 (Crash in sp_rcontext)
sql/sp_head.cc:
Bug#33618 (Crash in sp_rcontext)
sql/sp_head.h:
Bug#33618 (Crash in sp_rcontext)
sql/sp_rcontext.cc:
Bug#33618 (Crash in sp_rcontext)
sql/sp_rcontext.h:
Bug#33618 (Crash in sp_rcontext)
sql/sql_yacc.yy:
Bug#33618 (Crash in sp_rcontext)
