into selena.:H:/MYSQL/src/#13377-mysql-5.0
mysql-test/include/check_var_limit.inc:
Auto merged
mysql-test/include/have_big5.inc:
Auto merged
mysql-test/include/have_compress.inc:
Auto merged
mysql-test/include/have_crypt.inc:
Auto merged
mysql-test/include/have_outfile.inc:
Auto merged
mysql-test/include/have_query_cache.inc:
Auto merged
mysql-test/include/have_tis620.inc:
Auto merged
mysql-test/include/have_ucs2.inc:
Auto merged
mysql-test/include/have_ujis.inc:
Auto merged
mysql-test/include/not_embedded.inc:
Auto merged
mysql-test/include/system_db_struct.inc:
Auto merged
mysql-test/include/test_outfile.inc:
Auto merged
mysql-test/r/greedy_optimizer.result:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/index_merge_bdb.result:
Auto merged
mysql-test/r/index_merge_innodb.result:
Auto merged
mysql-test/r/index_merge_innodb2.result:
Auto merged
mysql-test/r/index_merge_ror.result:
Auto merged
mysql-test/r/index_merge_ror_cpk.result:
Auto merged
mysql-test/r/join_nested.result:
Auto merged
mysql-test/r/rowid_order_bdb.result:
Auto merged
mysql-test/r/rowid_order_innodb.result:
Auto merged
mysql-test/r/rpl_session_var.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sum_distinct.result:
Auto merged
mysql-test/std_data/des_key_file:
Auto merged
mysql-test/std_data/init_file.dat:
Auto merged
mysql-test/std_data/loaddata1.dat:
Auto merged
mysql-test/std_data/loaddata2.dat:
Auto merged
mysql-test/std_data/loaddata3.dat:
Auto merged
mysql-test/std_data/loaddata4.dat:
Auto merged
mysql-test/std_data/rpl_loaddata.dat:
Auto merged
mysql-test/std_data/rpl_loaddata2.dat:
Auto merged
mysql-test/std_data/warnings_loaddata.dat:
Auto merged
mysql-test/t/greedy_optimizer.test:
Auto merged
mysql-test/t/index_merge.test:
Auto merged
mysql-test/t/index_merge_bdb.test:
Auto merged
mysql-test/t/index_merge_innodb.test:
Auto merged
mysql-test/t/index_merge_innodb2.test:
Auto merged
mysql-test/t/index_merge_ror.test:
Auto merged
mysql-test/t/index_merge_ror_cpk.test:
Auto merged
mysql-test/t/join_nested.test:
Auto merged
mysql-test/t/rowid_order_bdb.test:
Auto merged
mysql-test/t/rowid_order_innodb.test:
Auto merged
mysql-test/t/rpl_session_var.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/sum_distinct.test:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/include/check_var_limit.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_big5.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_compress.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_crypt.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_outfile.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_query_cache.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_tis620.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_ucs2.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_ujis.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/not_embedded.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/system_db_struct.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/test_outfile.inc:
Turn off EOLN_NATIVE flag
mysql-test/r/greedy_optimizer.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_bdb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb2.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror_cpk.result:
Turn off EOLN_NATIVE flag
mysql-test/r/join_nested.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_bdb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_innodb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rpl_session_var.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp-error.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp-security.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sum_distinct.result:
Turn off EOLN_NATIVE flag
mysql-test/std_data/des_key_file:
Turn off EOLN_NATIVE flag
mysql-test/std_data/init_file.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata1.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata2.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata3.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata4.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata2.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/warnings_loaddata.dat:
Turn off EOLN_NATIVE flag
mysql-test/t/greedy_optimizer.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_bdb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb2.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror_cpk.test:
Turn off EOLN_NATIVE flag
mysql-test/t/join_nested.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_bdb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_innodb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rpl_session_var.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp-error.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp-security.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sum_distinct.test:
Turn off EOLN_NATIVE flag
into mysql.com:/home/pem/work/bug7049/mysql-5.0
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
mysql-test/r/sp.result:
Updated test results after fixing error handling in select.
sql/mysqld.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/protocol.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/sp_rcontext.h:
Added method for checking if the handler was found in the current context.
sql/sql_error.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
Disable tests of lock upgrade paths that are currently unsupported
ndb/test/ndbapi/testOperations.cpp:
Disable lock upgrade paths that currently unsupported
Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/t/sp.test:
Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/t/sp-security.test:
Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp.result:
Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp-security.result:
Test for bug#12812 moved from sp.test to sp-security.test
into mysql.com:/usr/home/bar/mysql-5.0.char1
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_func.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
after merge fix.
sql/sql_update.cc:
discarding this change in 5.0.
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge
mysql-test/r/select.result:
Change column name in test to get GROUP BY to use the alias
mysql-test/r/type_blob.result:
Test BLOB and VARCHAR sorting
mysql-test/t/select.test:
Change column name in test to get GROUP BY to use the alias
Drop used tables at start of test
Don't use table names 'a', 'b' or 'c'
mysql-test/t/type_blob.test:
Test BLOB and VARCHAR sorting
sql/field.cc:
Store length last in VARBINARY() and BLOB() columns to get shorter strings sorted before longer onces
sql/field.h:
Added method 'sort_length()' to allow one to have length bytes last for VARBINARY/BLOB to get these to sort properly
sql/filesort.cc:
Use 'sort_length()' instead of 'pack_length()' to get length of field.
Store suffix_length last for varbinary (blob) objects.
The above ensures that BLOB/VARBINARY are correctly sorted (shorter strings before longer ones)
sql/sql_class.h:
Added sort suffix length (to get varbinary/blob to sort correctly)
sql/sql_select.cc:
Use sort_length() instead of pack_lengths()
strings/ctype-bin.c:
Don't let strnxfrm_bin store length last
Better to do it in MySQL field object to ensure it's done properly for all cases
- fixed test
mysql-test/r/rpl_multi_update2.result:
fixed setting/reseting environment
multi-update with subquery added
mysql-test/t/rpl_multi_update2.test:
fixed setting/reseting environment
multi-update with subquery added
sql/sql_update.cc:
set 'updating' in both tables list if we have two of them (because of subquery)
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes
when dumping triggers
client/mysqldump.c:
BUG# 13146
Re-application of fix to clean 5.0 tree.
Added comments for quote_name, moved declarations into proper order,
unset MASK_ANSI_QUOTES flag in opt_compatible_mode global when dumping
triggers
mysql-test/r/mysqldump.result:
BUG# 13146
New test results
mysql-test/t/mysqldump.test:
BUG# 13146
New test
to assign a potential existing mysql user to the correct user group (BUG#12823)
support-files/mysql.spec.sh:
- added a usermod call to assign a potential existing mysql user to the
correct user group (BUG#12823)
- added a usermod call to assign a potential existing mysql user to the
correct user group (BUG#12823)
- Save the perror binary built during Max build so it supports the NDB
error codes (BUG#13740)
- added a separate macro "mysqld_group" to be able to define the
user group of the mysql user seperately, if desired.
support-files/mysql.spec.sh:
- added a usermod call to assign a potential existing mysql user to the
correct user group (BUG#12823)
- Save the perror binary built during Max build so it supports the NDB
error codes (BUG#13740)
- added a separate macro "mysqld_group" to be able to define the
user group of the mysql user seperately, if desired.
