Updated to use new tool(s):Missed on call, resubmitting


mysql-test/t/rpl_known_bugs_detection.test:
  Updated to use new tool(s):Missed on call, resubmitting

into  mysql.com:/data2/mysql-5.1-maint

  Updated to use new tool(s)


mysql-test/t/rpl_known_bugs_detection.test:
  Updated to use new tool(s)

mysql-test/r/func_in.result:
  After-merge fix.
    - result adjusted.

into  mysql.com:/home/ram/work/b28748/b28748.5.1


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

into  mysql.com:/data2/mysql-5.1-maint

mysql-test/include/wait_for_slave_io_to_stop.inc:
  Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.
mysql-test/include/wait_for_slave_sql_to_stop.inc:
  Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.
mysql-test/include/wait_for_slave_to_start.inc:
  Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.
mysql-test/include/wait_for_slave_to_stop.inc:
  Updated previous commit to include Magnus's change request from review. In addition, I moved it from the mysql-5.1 to mysql-5.1-maint clone. We now have 3 new replications tools and one tool that has been refactored. 1) include/wait_for_slave_to_stop.inc replaces the old mysqltest.c wait_for_slave_to_stop. NEW: 2) include/wait_for_slave_sql_to_stop.inc is for when you are expecting the slave to get an SQL error and waiting for the SQL Thread to stop. 3) include/wait_for_slave_io_to_stop.inc is used for test that you expect sometype of IO error and the IO Thread to stop. 4) include/wait_for_slave_to_start.inc for waiting for the slave to completely start before moving forward in the test. All 4 tests have a built in loop that will stop the test if any of the tools take too long.
mysql-test/t/rpl_critical_errors.test:
  Updated to use new tool(s)
mysql-test/t/rpl_dual_pos_advance.test:
  Updated to use new tool(s)
mysql-test/t/rpl_known_bugs_detection.test:
  Updated to use new tool(s)
mysql-test/t/rpl_rotate_logs.test:
  Updated to use new tool(s)
mysql-test/t/rpl_row_inexist_tbl.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
  Updated to use new tool(s)
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
  Updated to use new tool(s)

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/sql_parse.cc:
  manually merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2


sql/sql_parse.cc:
  Auto merged

	protocol

Fixed duplicated code, same as last commit.

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar.


sql/sql_parse.cc:
  Additional location of signed-char casted to uint.

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


sql/sql_select.cc:
  Auto merged

into  polly.local:/home/kaa/src/maint/bug28895/my51-bug28895


sql/sql_select.cc:
  Manual merge.

	protocol

Update for function moved to new file in 5.1.

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.
  
Instead, cast the *passwd char to uchar.


sql/sql_connect.cc:
  Update for function moved to new file in 5.1.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/sql_parse.cc:
  Functions are moved to a new file in 5.1.

In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.


sql/sql_select.cc:
  In create_tmp_table() don't set full table path as a table name. Other code assumes table names to not exceed NAME_LEN bytes.
mysql-test/r/long_tmpdir.result:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir-master.opt:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir-master.sh:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"
mysql-test/t/long_tmpdir.test:
  Added testcase for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long"

Problem: we may get unexpected results comparing [u]longlong values as doubles.
Fix: adjust the test to use integer comparators.
Note: it's not a real fix, we have to implement some new comparators 
to completely solve the original problem (see my comment in the bug report).


mysql-test/r/func_in.result:
  Fix for bug #28748: "Select" returning one value too few
    - result adjusted.
mysql-test/t/func_in.test:
  Fix for bug #28748: "Select" returning one value too few
    - test adjusted to use integer comparisons.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


configure.in:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2


sql/sql_parse.cc:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint

	protocol

One could send a malformed packet that caused the server to SEGV.  In 
recent versions of the password protocol, the client tells the server 
what length the ciphertext is (almost always 20).  If that length was
large enough to overflow a signed char, then the number would jump to 
very large after being casted to unsigned int.

Instead, cast the *passwd char to uchar. 



sql/sql_parse.cc:
  Cast *passwd to get rid of the sign, so that sign extension doesn't
  cause the sequence 125, 126, 127, 4294967169, 4294967170.

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
BitKeeper/deleted/.del-show_binlog_events.inc:
  Delete: mysql-test/include/show_binlog_events.inc
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Merge 5.0->5.1(preserving 5.1 file)

- Backport include/show_binlog_events.inc from 5.1 and use it to make
the test output consistent results


mysql-test/r/mix_innodb_myisam_binlog.result:
  Backport include/show_binlog_events.inc from 5.1 and use it to make
  the test output consistent results
mysql-test/t/mix_innodb_myisam_binlog.test:
  Backport include/show_binlog_events.inc from 5.1 and use it to make
  the test output consistent results
mysql-test/include/show_binlog_events.inc:
  New BitKeeper file ``mysql-test/include/show_binlog_events.inc''

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Merge 5.0->5.1
mysql-test/r/binlog_stm_binlog.result:
  Merge 5.0->5.1

to crrectly filter tests to run

mysql-test/lib/mtr_cases.pl:
  Don't turn off binlog in versions prior to 5.0
mysql-test/r/binlog.result:
  Update result after adding "one more select"
mysql-test/t/binlog.test:
  Update result after adding "one more select"

into  rama.(none):/home/jimw/my/mysql-5.1-clean


mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/sp_trans.test:
  Auto merged

 - Fix test to work on OS where backslashes are forward


mysql-test/include/uses_vardir.inc:
  Make the test work on windows too

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/sp-code.test:
  Auto merged

BitKeeper/deleted/.del-is_debug_build.inc:
  Rename: mysql-test/include/is_debug_build.inc -> BitKeeper/deleted/.del-is_debug_build.inc

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/include/master-slave.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Merge 5.0->5.1
mysql-test/t/binlog_killed.test:
  Merge 5.0->5.1

Mark one more test as needing binlog


mysql-test/include/master-slave.inc:
  Fix typo
mysql-test/lib/mtr_cases.pl:
  Fix typo
mysql-test/r/have_log_bin.require:
  Fix typo
mysql-test/t/binlog_killed.test:
  Need binlog

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/triggers/pre-commit:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_binlog_basic2.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged

into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint