Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
Many files:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
ndb_lock.result, ha_ndbcluster.cc:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
NdbDictionaryImpl.hpp:
Fix of bad merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Fix of bad merge
sql/ha_ndbcluster.cc:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
mysql-test/r/ndb_lock.result:
Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adaption to 5.1 code
sql/ha_ndbcluster_binlog.cc:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
mysql-test/r/rpl_ndb_basic.result:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
mysql-test/t/rpl_ndb_basic.test:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
sql/ha_ndbcluster_binlog.h:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: adaption to MySQ Cluster replication
sql/sql_delete.cc:
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table: locked lock_OPEN mutex to support TRUNCATE with re-create and cluster binlog
into mysql.com:/home/marty/MySQL/mysql-5.1
mysql-test/t/ndb_lock.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
mysql-test/r/ndb_lock.result:
Merge
sql/ha_ndbcluster.cc:
Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Merge
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Merge
storage/ndb/src/ndbapi/ndberror.c:
Merge
into mysql.com:/home/mydev/mysql-5.0-amerge
mysql-test/r/lock_multi.result:
Merging 5.0-engines to 5.0 master.
mysql-test/t/lock_multi.test:
Merging 5.0-engines to 5.0 master.
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
VC++Files/client/mysql.dsp:
Auto merged
mysql-test/t/func_time.test:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
client/mysqldump.c:
Manual merge
mysql-test/r/func_time.result:
Manual merge
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
BitKeeper/deleted/.del-generate_prefix_files.pl:
Delete: extra/yassl/include/openssl/generate_prefix_files.pl
BitKeeper/deleted/.del-prefix_crypto.h:
Delete: extra/yassl/include/openssl/prefix_crypto.h
BitKeeper/deleted/.del-prefix_ssl.h:
Delete: extra/yassl/include/openssl/prefix_ssl.h
BitKeeper/deleted/.del-Makefile.am~abb265028eb9b6a7:
Auto merged
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7:
Auto merged
BitKeeper/deleted/.del-yassl.m4~e55e55c1e863abaf:
Auto merged
client/mysqltest.c:
Auto merged
extra/yassl/include/openssl/crypto.h:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/Makefile.am:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
extra/yassl/testsuite/Makefile.am:
Auto merged
extra/yassl/yassl.vcproj:
Auto merged
include/violite.h:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/include/common-tests.inc:
Auto merged
mysql-test/r/analyze.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/key_cache.result:
Auto merged
mysql-test/r/preload.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/analyze.test:
Auto merged
mysql-test/t/explain.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
vio/Makefile.am:
Auto merged
client/Makefile.am:
Manual merge
libmysqld/Makefile.am:
Manual merge
mysql-test/r/compress.result:
Manual merge
mysql-test/r/explain.result:
Manual merge
mysql-test/r/select.result:
Manual merge
mysql-test/r/view.result:
Manual merge
mysql-test/t/select.test:
Manual merge
mysql-test/t/view.test:
Manual merge
sql/sql_base.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
mysql-test/mysql-test-run.pl:
Found when fixing bug#20303: The "usage()" function ignored the message it was given,
so we got no real indication about the problem. Print it if one is given.
mysql-test/mysql-test-run.pl:
A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument":
Due to the use of 'pass_through' in option processing this lone '--' will remain
as an argument, it must be ignored explicitly.
query
Problem:
There was a wrong context assigned to the columns that were added in insert_fields()
when expanding a '*'. When this is done in a prepared statement it causes
fix_fields() to fail to find the table that these columns reference.
Actually the right context is set in setup_natural_join_row_types() called at the
end of setup_tables(). However when executed in a context of a prepared statement
setup_tables() resets the context, but setup_natural_join_row_types() was not
setting it to the correct value assuming it has already done so.
Solution:
The top-most, left-most NATURAL/USING join must be set as a
first_name_resolution_table in context even when operating on prepared statements.
mysql-test/r/join.result:
testsuite for the bug
mysql-test/t/join.test:
testsuite for the bug
sql/sql_base.cc:
The context must be set even when executed as prepared statement.
The st_lex::which_check_option_applicable() function controls for which
statements WITH CHECK OPTION clause should be taken into account. REPLACE and
REPLACE_SELECT wasn't in the list which results in allowing REPLACE to insert
wrong rows in a such view.
The st_lex::which_check_option_applicable() now includes REPLACE and
REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
applicable.
mysql-test/t/replace.test:
Added test case for bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
mysql-test/r/replace.result:
Added test case for bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
sql/sql_lex.h:
Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
The st_lex::which_check_option_applicable() now includes REPLACE and
REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
applicable.
mysql-test/r/auto_increment.result:
Fix for bug #6880: LAST_INSERT_ID() within a statement
- test result
mysql-test/r/rpl_log.result:
Fix for bug #6880: LAST_INSERT_ID() within a statement
- test result
mysql-test/t/auto_increment.test:
Fix for bug #6880: LAST_INSERT_ID() within a statement
- test case
mysql-test/t/rpl_log.test:
Fix for bug #6880: LAST_INSERT_ID() within a statement
- test case
sql/item_func.cc:
Fix for bug #6880: LAST_INSERT_ID() within a statement
- return the first thd->last_insert_id set (within a query)
To calculate its max_length the CONCAT() function is simply sums max_lengths
of its arguments but when the collation of an argument differs from the
collation of the CONCAT() max_length will be wrong. This may lead to a data
truncation when a tmp table is used, in UNIONS for example.
The Item_func_concat::fix_length_and_dec() function now recalculates the
max_length of an argument when the mbmaxlen of the argument differs from the
mbmaxlen of the CONCAT().
mysql-test/t/func_concat.test:
Added test case for bug#15962:CONCAT() in UNION may lead to a data trucation.
mysql-test/r/func_concat.result:
Added test case for bug#15962:CONCAT() in UNION may lead to a data trucation.
sql/item_strfunc.cc:
Fixed bug#15962: CONCAT() in UNION may lead to a data trucation.
The Item_func_concat::fix_length_and_dec() function now recalculates the
max_length of an argument when the mbmaxlen of the argument differs from the
mbmaxlen of the CONCAT().
Fixed BUG#19727 "InnoDB crashed server and crashed tables
are not recoverable".
innobase/row/row0mysql.c:
Applied innodb-5.0-ss609 snapshot.
Move trx_commit_for_mysql(trx) calls before calls to
row_mysql_unlock_data_dictionary(trx).
innobase/row/row0sel.c:
Applied innodb-5.0-ss609 snapshot.
row_sel_try_search_shortcut(): Do not return SEL_FOUND when
the record was not found. This bug was introduced in
InnoDB 5.0.3, but luckily it should nerver manifest itself,
given that existing InnoDB SQL code never makes use of
consistent reads.
mysql-test/t/innodb.test:
Applied innodb-5.0-ss609 snapshot.
Add the big fat warning notice also to the bottom of
innodb.test so that it will require more talent to
ignore the change of policy.
Changed error to be more descriptive when you are refering to a not existing key
Fixed core dump in view test and changed to better error message
BUILD/compile-pentium64-debug-max:
Added --pipe option for faster compile
(This changset was missing in the tree I used to rebuild a new 5.1 tree)
BUILD/compile-pentium64-debug:
Added --pipe option for faster compile
(This changset was missing in the tree I used to rebuild a new 5.1 tree)
mysql-test/include/common-tests.inc:
Changed error to be more descriptive
mysql-test/r/compress.result:
Changed error to be more descriptive
mysql-test/r/explain.result:
Changed error to be more descriptive
mysql-test/r/key_cache.result:
Changed error to be more descriptive
mysql-test/r/preload.result:
Changed error to be more descriptive
mysql-test/r/select.result:
Changed error to be more descriptive
mysql-test/r/ssl.result:
Changed error to be more descriptive
mysql-test/r/ssl_compress.result:
Changed error to be more descriptive
mysql-test/r/view.result:
Changed error to be more descriptive
mysql-test/t/disabled.def:
Disable im_instance_conf and im_options until Bug#20294 (Instance manager test im_instance_conf fails randomly) is fixed
mysql-test/t/explain.test:
Changed error to be more descriptive
mysql-test/t/select.test:
Changed error to be more descriptive
mysql-test/t/view.test:
Changed error to be more descriptive
sql/share/errmsg.txt:
Fix that ER_KEY_DOES_NOT_EXISTS has same SQLSTATE as ER_KEY_COLUMN_DOES_NOT_EXISTS
sql/sql_base.cc:
Fixed core dump in view test
Changed to correct error message that also shows the name of the faulty table
BUILD/compile-pentium64:
New BitKeeper file ``BUILD/compile-pentium64''
Old FRM files didn't allow byte 255 as a column name part.
Since now we store column names in UTF8, this restriction
is not required anymore: 255 is not a valid byte in UTF8.
Fix: removing checking against 255.
mysql-test/r/ctype_latin1.result:
Adding test case
mysql-test/t/ctype_latin1.test:
Adding test case
sql/sql_lex.cc:
Removing old code, unnecessary anymore.
mysql-test/r/partition_range.result:
Changed test cases
mysql-test/t/partition_range.test:
Changed test cases
sql/partition_info.cc:
Changes to resue signed integer code for unsigned integer partition functions
Basic idea is to store value - 0x8000000000000000 in list_array and range_int_array
and also perform this subtraction before applying get_partition_id_range and so
forth.
sql/sql_partition.cc:
Changes to resue signed integer code for unsigned integer partition functions
Basic idea is to store value - 0x8000000000000000 in list_array and range_int_array
and also perform this subtraction before applying get_partition_id_range and so
forth.
RPL Test cleanup of options that are not needed when using ndbcluster with binlog. The binlog is forced to row just by connecting to a cluster
mysql-test/r/rpl_ndb_2myisam.result:
Update results. Test now passing. Have commented it out in disable.def file
mysql-test/t/disabled.def:
updated to comment out test that is working
mysql-test/t/rpl_ndb_2innodb-master.opt:
Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_2innodb-slave.opt:
Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_2myisam-master.opt:
Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_2myisam-slave.opt:
Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_innodb2ndb-master.opt:
Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_innodb2ndb-slave.opt:
Removed the --binlog-format=row and they are not needed
mysql-test/t/rpl_ndb_myisam2ndb-slave.opt:
Removed the --binlog-format=row and they are not needed
