into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/r/drop.result:
SCCS merged
mysql-test/t/drop.test:
SCCS merged
Fixes:
- Bug #34920: auto_increment resets to 1 on foreign key creation
We need to use/inherit the passed in autoinc counter for ALTER TABLE
statements too.
mysql-test/r/innodb.result:
Apply innodb-5.1-ss2360 snapshot
Revision r2345:
branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
counter for ALTER TABLE statements too.
mysql-test/t/innodb.test:
Apply innodb-5.1-ss2360 snapshot
Revision r2345:
branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
counter for ALTER TABLE statements too.
storage/innobase/dict/dict0dict.c:
Apply innodb-5.1-ss2360 snapshot
Revision r2353:
branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
the assertion where it crashed previously, since the type has now changed
to unsigned, it doesn't make sense to check for < 0. Added new tests, to
check for overflow, for the different INT types supported for both
signed and unsigned.
storage/innobase/handler/ha_innodb.cc:
Apply innodb-5.1-ss2360 snapshot
Revision r2353:
branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
the assertion where it crashed previously, since the type has now changed
to unsigned, it doesn't make sense to check for < 0. Added new tests, to
check for overflow, for the different INT types supported for both
signed and unsigned.
Revision r2345:
branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
counter for ALTER TABLE statements too.
storage/innobase/handler/ha_innodb.h:
Apply innodb-5.1-ss2360 snapshot
Revision r2353:
branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
the assertion where it crashed previously, since the type has now changed
to unsigned, it doesn't make sense to check for < 0. Added new tests, to
check for overflow, for the different INT types supported for both
signed and unsigned.
storage/innobase/include/dict0dict.h:
Apply innodb-5.1-ss2360 snapshot
Revision r2353:
branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
the assertion where it crashed previously, since the type has now changed
to unsigned, it doesn't make sense to check for < 0. Added new tests, to
check for overflow, for the different INT types supported for both
signed and unsigned.
storage/innobase/include/dict0mem.h:
Apply innodb-5.1-ss2360 snapshot
Revision r2353:
branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
the assertion where it crashed previously, since the type has now changed
to unsigned, it doesn't make sense to check for < 0. Added new tests, to
check for overflow, for the different INT types supported for both
signed and unsigned.
storage/innobase/include/row0sel.h:
Apply innodb-5.1-ss2360 snapshot
Revision r2353:
branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
the assertion where it crashed previously, since the type has now changed
to unsigned, it doesn't make sense to check for < 0. Added new tests, to
check for overflow, for the different INT types supported for both
signed and unsigned.
storage/innobase/include/univ.i:
Apply innodb-5.1-ss2360 snapshot
Revision r2353:
branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
the assertion where it crashed previously, since the type has now changed
to unsigned, it doesn't make sense to check for < 0. Added new tests, to
check for overflow, for the different INT types supported for both
signed and unsigned.
storage/innobase/row/row0sel.c:
Apply innodb-5.1-ss2360 snapshot
Revision r2353:
branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
the assertion where it crashed previously, since the type has now changed
to unsigned, it doesn't make sense to check for < 0. Added new tests, to
check for overflow, for the different INT types supported for both
signed and unsigned.
sql/set_var.h:
Changing order of initializer list for sys_var class constructor to
eliminate compiler warning.
mysql-test/suite/binlog/combinations:
New BitKeeper file ``mysql-test/suite/binlog/combinations''
for YEAR data type.
The problem was that for some unknown reason 0 was not allowed
as a default value for YEAR data type. That was coded before BK.
However the Manual does not say a word about such a limitation.
Also, it looks inconsistent with other data types.
The fix is to allow 0 as a default value.
mysql-test/r/create.result:
Update result file.
mysql-test/t/create.test:
Add a test case for Bug#34274: Invalid handling of 'DEFAULT 0'
for YEAR data type.
sql/unireg.cc:
Allow 0 as a default value for YEAR data type.
mysql-test/r/information_schema_db.result:
Update result file.
mysql-test/r/sp-security.result:
Update result file.
mysql-test/r/trigger_notembedded.result:
Update result file.
mysql-test/r/view_grant.result:
Update result file.
if mysql.proc does not exist.
mysql-test/r/drop.result:
Update result file.
mysql-test/t/drop.test:
Add a test case for Bug#29958: Weird message on DROP DATABASE
if mysql.proc does not exist.
into quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
libmysql/libmysql.c:
Auto merged
sql-common/client.c:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
The problem was in a test case for Bug33507:
- when the number of active connections reaches the limit,
the server accepts only root connections. That's achieved by
accepting a connection, negotiating with the client and
checking user credentials. If it is not SUPER, the connection
is dropped.
- when the server accepts connection, it increases the counter;
- when the server drops connection, it decreases the counter;
- the race was in between of decreasing the counter and accepting
new connection:
- max_user_connections = 2;
- 2 oridinary user connections accepted;
- extra user connection is establishing;
- server checked user credentials, and sent 'Too many connections'
error;
- the client receives the error and establishes extra SUPER user
connection;
- the server however didn't decrease the counter (the extra
user connection still is "alive" in the server) -- so, the new
SUPER-user connection, will be dropped, because it exceeds
(max_user_connections + 1).
The fix is to implement "safe connect", which makes several attempts
to connect and use it in the test script.
mysql-test/r/connect.result:
Update test file.
mysql-test/t/connect.test:
Avoid races in connect.test.
mysql-test/include/connect2.inc:
Auxiliary routine to establish a connection reliably.
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
mysql-test/include/commit.inc:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/r/commit_1innodb.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/rpl_rli.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
mysql-test/suite/binlog/r/binlog_unsafe.result:
Auto merged
mysql-test/suite/binlog/t/binlog_unsafe.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_loaddata.test:
Removing SHOW MASTER STATUS that does not seem to make sense.
mysql-test/extra/rpl_tests/rpl_log.test:
Correcting test case to sync slave with master.
mysql-test/suite/binlog/r/binlog_unsafe.result:
Result change.
mysql-test/suite/binlog/t/binlog_unsafe.test:
Removing unsafe variable from list of safe variables.
mysql-test/suite/rpl/r/rpl_loaddata.result:
Result change.
mysql-test/suite/rpl/r/rpl_skip_error.result:
Result change.
mysql-test/suite/rpl/t/rpl_skip_error.test:
Correcting bad manual+automatic merge. Test is now only relevant for statement-
based replication.
sql/rpl_rli.cc:
Correcting automerge undoing previous change of return value.
Relay_log_info::wait_for_pos() should return -2 when not initialized to work
correctly.
into trift2.:/MySQL/M51/push-5.1
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/unireg.h:
Auto merged
in some case.
ER_CON_COUNT_ERROR is defined with SQL state 08004. However, this SQL state is not always
returned.
This error can be thrown in two cases:
1. when an ordinary user (a user w/o SUPER privilege) is connecting,
and the number of active user connections is equal or greater than
max_connections.
2. when a user is connecting and the number of active user connections is
already (max_connections + 1) -- that means that no more connections will
be accepted regardless of the user credentials.
In the 1-st case, SQL state is correct.
The bug happens in the 2-nd case -- on UNIX the client gets 00000 SQL state, which is
absolutely wrong (00000 means "not error SQL state); on Windows
the client accidentally gets HY000 (which means "unknown SQL state).
The cause of the problem is that the server rejects extra connection
prior to read a packet with client capabilities. Thus, the server
does not know if the client supports SQL states or not (if the client
supports 4.1 protocol or not). So, the server supposes the worst and
does not send SQL state at all.
The difference in behavior on UNIX and Windows occurs because on Windows
CLI_MYSQL_REAL_CONNECT() invokes create_shared_memory(), which returns
an error (in default configuration, where shared memory is not configured).
Then, the client does not reset this error, so when the connection is
rejected, SQL state is HY000 (from the error from create_shared_memory()).
The bug appeared after test case for Bug#33507 -- before that, this behavior
just had not been tested.
The fix is to 1) reset the error after create_shared_memory();
2) set SQL state to 'unknown error' if it was not received from
the server.
A separate test case is not required, since the behavior is already
tested in connect.test.
Note for doc-team: the manual should be updated to say that under
some circumstances, 'Too many connections' has HY000 SQL state.
mysql-test/r/connect.result:
Update result file.
sql-common/client.c:
1. Reset an error from create_shared_memory();
2. Set SQL state to 'unknown error' if it was not received from
the server.
The problem is that since MyISAM's concurrent_insert is on by
default some concurrent SELECT statements might not see changes
made by INSERT statements in other connections, even if the
INSERT statement has returned.
The solution is to disable concurrent_insert so that INSERT
statements returns after the data is actually visible to other
statements.
mysql-test/r/flush_read_lock_kill.result:
Restore old value of @@global.concurrent_insert
mysql-test/r/kill.result:
Restore old value of @@global.concurrent_insert
mysql-test/r/sp_notembedded.result:
Update test case result
mysql-test/t/flush_read_lock_kill.test:
Restore old value of @@global.concurrent_insert so it
doesn't affect other tests.
mysql-test/t/kill.test:
Restore old value of @@global.concurrent_insert so it
doesn't affect other tests.
mysql-test/t/sp_notembedded.test:
Disable and restore concurrent_insert value at the end of the
test case. The test case for Bug 29936 requires that the inserted
rows need to be visible before a SELECT statement is queued in
another connection.
Remove sleep at the start of the test, it's not necessary to log
the result of the processlist command, showing the warnings has
the same end result.
The problem was that number of threads was used to calculate
max_used_connections.
The fix is to use number of active connections.
mysql-test/r/connect.result:
Update result file.
mysql-test/t/connect.test:
- Add a test case for Bug#35074: max_used_connections is not correct;
- Make a test case for Bug#33507 more stable.
sql/mysqld.cc:
Use number of connections insetad of threads
to calculate max_used_connections.
table with backticks
(Thanks to Lu Jingdong, though I did not take his patch directly, as
it contained a significant flaw.)
It wasn't a backtick/parsing problem. We merely didn't anticipate
and allocate enough space to handle the optional "#mysql50#" table-
name prefix.
Now, allocate that extra space in case we need it when we look up
a legacy table to get its file's name.
mysql-test/r/drop.result:
Verify that databases with old-style files can be removed.
mysql-test/t/drop.test:
Verify that databases with old-style files can be removed.
sql/sql_db.cc:
Extend the size of the memory that holds the table's name, so that
the legacy "mysql50" prefix fits.
than max_connections -- which results in user lockout.
The problem was that the variable thread_count that contains
the number of active threads was interpreted as a number of
active connections.
The fix is to introduce a new counter for active connections.
mysql-test/r/connect.result:
A test case for Bug#33507: Event scheduler creates more threads
than max_connections -- which results in user lockout.
mysql-test/t/connect.test:
A test case for Bug#33507: Event scheduler creates more threads
than max_connections -- which results in user lockout.
sql/mysql_priv.h:
1. Polishing: login_connection() and end_connection() need not
to be public.
2. Introduce connection_count -- a variable to contain the number
of active connections. It is protected by LOCK_connection_count.
sql/mysqld.cc:
Use connection_count to count active connections.
sql/sql_connect.cc:
1. Use connection_count to count active connections.
2. Make login_connection(), end_connection() private for the module
as they had to be.
In cases when TRUNCATE was executed by invoking mysql_delete() rather
than by table recreation (for example, when TRUNCATE was issued on
InnoDB table with is referenced by foreign key) triggers were invoked.
In debug builds this also led to crash because of an assertion, which
assumes that some preliminary actions take place before trigger
invocation, which doesn't happen in case of TRUNCATE.
The fix is not to execute triggers in mysql_delete() when this
function is used by TRUNCATE.
mysql-test/r/trigger-trans.result:
Update result file.
mysql-test/t/trigger-trans.test:
A test case for Bug#34643: TRUNCATE crash if trigger and foreign key.
sql/sql_delete.cc:
Do not process triggers in TRUNCATE.
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
mysql-test/suite/rpl/r/rpl_loaddata.result:
Auto merged
mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
Auto merged
mysql-test/suite/rpl/r/rpl_slave_status.result:
Auto merged
mysql-test/suite/rpl/t/rpl_master_pos_wait.test:
Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
Auto merged
mysql-test/suite/rpl/t/rpl_loaddata.test:
Manual merge. The rpl_loaddata.test file was moved on 5.1 by editing
the file to include the file at the new location. This causes conflicts
when merging, since the changes will not propagate to the moved file.
sql/slave.cc:
Manual merge.
mysql-test/suite/rpl/t/rpl_skip_error.test:
Manual merge.
mysql-test/suite/rpl/t/rpl_slave_status.test:
Manual merge.
into kaamos.(none):/data/src/opt/mysql-5.1-opt
client/mysql.cc:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
into kaamos.(none):/data/src/opt/mysql-5.1-opt
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/func_time.result:
Manual merge.
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
Manual merge.
scripts/mysql_config.sh:
Manual merge.
sql-common/client.c:
Manual merge.
sql/sql_parse.cc:
Manual merge.
into kaamos.(none):/data/src/opt/mysql-5.0-opt
client/mysql.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
Manual merge.
scripts/mysql_config.sh:
Manual merge.
WL#4203 Reorganize and fix the data dictionary tests of
testsuite funcs_1
because the goal to fix
Bug#34532 Some funcs_1 tests do not clean up at end of testing
was partially missed.
Some minor additional modifications are for
WL#4304 Cleanup in funcs_1 tests
BitKeeper/deleted/.del-innodb_triggers.result:
Rename: mysql-test/suite/funcs_1/r/innodb_triggers.result -> BitKeeper/deleted/.del-innodb_triggers.result
BitKeeper/deleted/.del-memory_triggers.result:
Rename: mysql-test/suite/funcs_1/r/memory_triggers.result -> BitKeeper/deleted/.del-memory_triggers.result
BitKeeper/deleted/.del-myisam_triggers.result:
Rename: mysql-test/suite/funcs_1/r/myisam_triggers.result -> BitKeeper/deleted/.del-myisam_triggers.result
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/cursors/cursors_master.test:
Backport of file in 5.1
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Cleanup
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated results
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
Updated results
mysql-test/suite/funcs_1/r/is_columns_memory.result:
Updated results
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
Updated results
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
Updated results
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
Updated results
mysql-test/suite/funcs_1/r/is_tables_memory.result:
Updated results
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
Updated results
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated results
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
Backport of file in 5.1
mysql-test/suite/funcs_1/t/memory_storedproc.test:
Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
Backport of file in 5.1
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
Cleanup
mysql-test/suite/funcs_1/views/views_master.inc:
Backport of file in 5.1 which got many fixes for instabilities
and other improvements
Problem: rpl_variables_stm.test used a character set and a collation which
are not included on all platforms.
Fix: replace the character set and collation by ones that are included on
all platforms. (rpl_variables_stm does not rely on which character set is
used, the only important aspect is the fact that it changes.)
mysql-test/suite/rpl/r/rpl_variables_stm.result:
Updated result file.
mysql-test/suite/rpl/t/rpl_variables_stm.test:
Changed test to get rid of pushbuild errors.
into kaamos.(none):/data/src/opt/mysql-5.1-opt
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/null_key.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_select.cc:
Manual merge.
The reason is that we are using a sleep to wait for slave to reach the
slave_transaction_retries limit.
Fix: wait for the slave to stop instead. This is what we want to do, since
the slave stops when the limit is reached.
safe.
Fix: Move sql_mode: from the section of the test where safe variables are
tested, to the section where unsafe variables are tested.
mysql-test/suite/binlog/r/binlog_unsafe.result:
Updated result file of modified test.
into mysql.com:/misc/mysql/34749/51-34749
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
into mysql.com:/misc/mysql/34749/50-34749
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
into mysql.com:/misc/mysql/34749/51-34749
mysql-test/r/func_misc.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/ha_ndbcluster_cond.cc:
Auto merged
sql/ha_ndbcluster_cond.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
Affected tests fixing. After the fix for st_relay_log_info::wait_for_pos() that
handles widely used select('master-bin.xxxx',pos) invoked by mysqltest
there appeared to be four tests that either tried synchronizing when
the slave was stopped or used incorrect synchronization method like
to call `sync_with_master' from the current connection being to the
master itself.
Fixed with correcting the current connection or/and using the correct
synchronization macro when possible.
mysql-test/r/rpl_loaddata.result:
results changed
mysql-test/r/rpl_slave_status.result:
results changed
mysql-test/t/rpl_loaddata.test:
fixing cleanup for two tests
mysql-test/t/rpl_skip_error.test:
fixing cleanup for two tests
mysql-test/t/rpl_slave_status.test:
fixing cleanup
mysql-test/t/rpl_temporary.test:
fixing synchronizations to use the intended correct macro.
into five.local.lan:/work/merge/mysql-5.1-funcs_1
BitKeeper/deleted/.del-create_database.inc:
Auto merged
BitKeeper/deleted/.del-create_user_lowest_priv.inc:
Auto merged
BitKeeper/deleted/.del-create_user_no_super.inc:
Auto merged
BitKeeper/deleted/.del-datadict_master.inc:
Auto merged
BitKeeper/deleted/.del-datadict_show_schema.inc:
Auto merged
BitKeeper/deleted/.del-datadict_show_table_design.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
Auto merged
BitKeeper/deleted/.del-innodb__datadict.result:
Auto merged
BitKeeper/deleted/.del-innodb__datadict.test:
Auto merged
BitKeeper/deleted/.del-innodb__load.result:
Auto merged
BitKeeper/deleted/.del-innodb__load.test:
Auto merged
BitKeeper/deleted/.del-memory__datadict.result:
Auto merged
BitKeeper/deleted/.del-memory__datadict.test:
Auto merged
BitKeeper/deleted/.del-memory__load.result:
Auto merged
BitKeeper/deleted/.del-memory__load.test:
Auto merged
BitKeeper/deleted/.del-myisam__datadict.result:
Auto merged
BitKeeper/deleted/.del-myisam__datadict.test:
Auto merged
BitKeeper/deleted/.del-myisam__load.result:
Auto merged
BitKeeper/deleted/.del-myisam__load.test:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Auto merged
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Auto merged
mysql-test/suite/funcs_1/include/sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_bitdata.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_bitdata.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Auto merged
BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_bitdata.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
Auto merged
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Auto merged
mysql-test/suite/funcs_1/t/innodb_bitdata.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_cursors.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_03.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_08.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_09.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
SCCS merged
mysql-test/suite/funcs_1/t/innodb_views.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_bitdata.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_cursors.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_0102.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_03.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_0407.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_08.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_09.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
SCCS merged
mysql-test/suite/funcs_1/t/memory_views.test:
SCCS merged
mysql-test/suite/funcs_1/t/myisam_cursors.test:
SCCS merged
mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
SCCS merged
mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
ur
mysql-test/suite/funcs_1/t/myisam_views.test:
ur
mysql-test/suite/funcs_1/r/myisam_views.result:
Manual merge
testsuite funcs_1
1. Fix the following bugs
Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
Solution: Test variants charset_collation_* adjusted to different builds
Bug#32603 "datadict" tests (all engines) fail in "community" tree: "PROFILING" table
Solution: Excluding "PROFILING" table from queries
Bug#33654 "slow log" is missing a line
Solution: Unify the content of the fields TABLES.TABLE_ROWS and
STATISTICS.CARDINALITY within result sets
Bug#34532 Some funcs_1 tests do not clean up at end of testing
Solution: DROP objects/reset global server variables modified during testing
+ let tests missing implementation end before loading of tables
Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
Solution: Cut <engine>__datadict tests into smaller tests + generate new results.
Bug#33599 INFORMATION_SCHEMA.STATISTICS got a new column INDEX_COMMENT: tests fail (2)
Generation of new results during post merge fix
Bug#33600 CHARACTER_OCTET_LENGTH is now CHARACTER_MAXIMUM_LENGTH * 4
Generation of new results during post merge fix
Bug#33631 Platform-specific replace of CHARACTER_MAXIMUM_LENGTH broken by 4-byte encoding
Generation of new results during post merge fix
+ removal of platform-specific replace routine (no more needed)
2. Restructure the tests
- Test not more than one INFORMATION_SCHEMA view per testscript
- Separate tests of I_S view layout+functionality from content related to the
all time existing databases "information_schema", "mysql" and "test"
- Avoid storage engine related variants of tests which are not sensible to
storage engines at all.
3. Reimplement or add some subtests + cleanup
There is a some probability that even the reviewed changeset
- does not fix all bugs from above or
- contains new bugs which show up on some platforms <> Linux or on one of
the various build types
4. The changeset contains fixes according to
- one code review
- minor bugs within testing code found after code review (accepted by reviewer)
- problems found during tests with 5.0.56 in build environment
mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
Change mode to -rw-rw-r--
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Change mode to -rw-rw-r--
BitKeeper/deleted/.del-innodb__load.test:
Delete: mysql-test/suite/funcs_1/t/innodb__load.test
BitKeeper/deleted/.del-innodb__load.result:
Delete: mysql-test/suite/funcs_1/r/innodb__load.result
BitKeeper/deleted/.del-myisam__load.test:
Delete: mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-memory__load.test:
Delete: mysql-test/suite/funcs_1/t/memory__load.test
BitKeeper/deleted/.del-memory__load.result:
Delete: mysql-test/suite/funcs_1/r/memory__load.result
BitKeeper/deleted/.del-myisam__load.result:
Delete: mysql-test/suite/funcs_1/r/myisam__load.result
BitKeeper/deleted/.del-create_database.inc:
Delete: mysql-test/suite/funcs_1/include/create_database.inc
BitKeeper/deleted/.del-create_user_lowest_priv.inc:
Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
BitKeeper/deleted/.del-create_user_no_super.inc:
Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
BitKeeper/deleted/.del-datadict_help_tables_build.result:
Delete: mysql-test/suite/funcs_1/r/datadict_help_tables_build.result
BitKeeper/deleted/.del-datadict_help_tables_build.test:
Delete: mysql-test/suite/funcs_1/t/datadict_help_tables_build.test
BitKeeper/deleted/.del-datadict_help_tables_dev.result:
Delete: mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result
BitKeeper/deleted/.del-datadict_help_tables_dev.test:
Delete: mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test
BitKeeper/deleted/.del-datadict_master.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
BitKeeper/deleted/.del-datadict_show_table_design.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
BitKeeper/deleted/.del-datadict_tables.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
BitKeeper/deleted/.del-datadict_tables_error.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
BitKeeper/deleted/.del-innodb__datadict.result:
Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
BitKeeper/deleted/.del-innodb__datadict.test:
Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
BitKeeper/deleted/.del-memory__datadict.test:
Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
BitKeeper/deleted/.del-myisam__datadict.result:
Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
BitKeeper/deleted/.del-myisam__datadict.test:
Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
BitKeeper/deleted/.del-memory__datadict.result:
Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
mysql-test/suite/funcs_1/README.txt:
Cleanup in description
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/include/sp_tb.inc:
Remove outdated comment
mysql-test/suite/funcs_1/r/innodb_bitdata.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_cursors.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Updated results
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated results
mysql-test/suite/funcs_1/r/memory_bitdata.result:
Updated results
mysql-test/suite/funcs_1/r/memory_cursors.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Updated results
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_bitdata.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_cursors.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated results
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Move setting of variables into the caller scripts
mysql-test/suite/funcs_1/t/innodb_bitdata.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_cursors.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_03.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_08.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_09.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
Cleanup
mysql-test/suite/funcs_1/t/innodb_views.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_bitdata.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_cursors.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_trig_0102.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_trig_03.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_trig_0407.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_trig_08.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_trig_09.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
Cleanup
mysql-test/suite/funcs_1/t/memory_views.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_bitdata.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_cursors.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_03.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_08.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_09.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
Cleanup
mysql-test/suite/funcs_1/t/myisam_views.test:
Cleanup
mysql-test/suite/funcs_1/t/charset_collation_1.test:
Check content of information_schema views
character_sets, collations,
collation_character_set_applicability
Build variant 1
mysql-test/suite/funcs_1/t/charset_collation_2.test:
Check content of information_schema views
character_sets, collations,
collation_character_set_applicability
Build variant 2
mysql-test/suite/funcs_1/t/charset_collation_3.test:
Check content of information_schema views
character_sets, collations,
collation_character_set_applicability
Build variant 3
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
Test some basic properties which are independend of the storage
engine used for the creation of tables.
mysql-test/suite/funcs_1/t/is_character_sets.test:
Tests related to functionality of
information_schema.character_sets
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test:
Tests related to functionality of
information_schema.collation_character_set_applicability
mysql-test/suite/funcs_1/t/is_collations.test:
Tests related to functionality of
information_schema.collations
mysql-test/suite/funcs_1/t/is_column_privileges.test:
Tests related to functionality of
information_schema.column_privileges
mysql-test/suite/funcs_1/t/is_column_privileges_is_mysql_test.test:
Check content of information_schema.column_privileges about databases
mysql and test
mysql-test/suite/funcs_1/t/is_columns.test:
Tests related to functionality of
information_schema.columns
mysql-test/suite/funcs_1/t/is_columns_innodb.test:
Check content of information_schema.columns when some
tables are preloaded
Variant for InnoDB
mysql-test/suite/funcs_1/t/is_columns_is.test:
Check content of information_schema.columns about schema
information_schema
mysql-test/suite/funcs_1/t/is_columns_memory.test:
Check content of information_schema.columns when some
tables are preloaded
Variant for MEMORY
mysql-test/suite/funcs_1/t/is_columns_myisam.test:
Check content of information_schema.columns when some
tables are preloaded
Variant for MyISAM
mysql-test/suite/funcs_1/t/is_columns_mysql.test:
Check content of information_schema.columns about schema
mysql
mysql-test/suite/funcs_1/t/is_columns_ndb.test:
Check content of information_schema.columns when some
tables are preloaded
Variant for NDB
mysql-test/suite/funcs_1/t/is_key_column_usage.test:
Tests related to functionality of
information_schema.key_column_usage
mysql-test/suite/funcs_1/t/is_routines.test:
Tests related to functionality of
information_schema.routines
mysql-test/suite/funcs_1/t/is_schema_privileges.test:
Tests related to functionality of
information_schema.schema_privileges
mysql-test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test:
Check content of information_schema.schema_privileges about schemas
information_schema, mysql and test
mysql-test/suite/funcs_1/t/is_schemata.test:
Tests related to functionality of
information_schema.schemata
mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test:
Check content of information_schema.schemata about schemas
information_schema, mysql and test
mysql-test/suite/funcs_1/t/is_statistics.test:
Tests related to functionality of
information_schema.statistics
mysql-test/suite/funcs_1/t/is_statistics_is.test:
Check content of information_schema.statistics about schema
information_schema
mysql-test/suite/funcs_1/t/is_statistics_mysql.test:
Check content of information_schema.statistics about schema
mysql
mysql-test/suite/funcs_1/t/is_table_constraints.test:
Tests related to functionality of
information_schema.table_constraints
mysql-test/suite/funcs_1/t/is_table_constraints_is.test:
Check content of information_schema.table_constraints about schema
information_schema
mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test:
Check content of information_schema.table_constraints about schema
mysql
mysql-test/suite/funcs_1/t/is_table_privileges.test:
Tests related to functionality of
information_schema.table_privileges
mysql-test/suite/funcs_1/datadict/basics_mixed1.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/basics_mixed2.inc:
Auxiliary script
mysql-test/suite/funcs_1/include/cleanup.inc:
Auxiliary script
mysql-test/suite/funcs_1/r/charset_collation_1.result:
Expected result for new test
mysql-test/suite/funcs_1/r/charset_collation_2.result:
Expected result for new test
mysql-test/suite/funcs_1/r/charset_collation_3.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_basics_mixed.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_character_sets.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_collations.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_column_privileges.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_column_privileges_is_mysql_test.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_columns.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_is.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_memory.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_mysql.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_key_column_usage.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_routines.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_schema_privileges.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_schemata.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_schemata_is_mysql_test.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_statistics.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_statistics_is.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_statistics_mysql.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_table_constraints.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_table_constraints_is.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_table_privileges.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_tables.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_is.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_memory.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_mysql.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_triggers.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_user_privileges.result:
Expected result for new test
mysql-test/suite/funcs_1/r/is_views.result:
Expected result for new test
mysql-test/suite/funcs_1/t/is_tables.test:
Tests related to functionality of
information_schema.tables
mysql-test/suite/funcs_1/t/is_tables_innodb.test:
Check content of information_schema.tables when some
tables are preloaded
Variant for InnoDB
mysql-test/suite/funcs_1/t/is_tables_is.test:
Check content of information_schema.tables about schema
information_schema
mysql-test/suite/funcs_1/t/is_tables_memory.test:
Check content of information_schema.tables when some
tables are preloaded
Variant for MEMORY
mysql-test/suite/funcs_1/t/is_tables_myisam.test:
Check content of information_schema.tables when some
tables are preloaded
Variant for MyISAM
mysql-test/suite/funcs_1/t/is_tables_mysql.test:
Check content of information_schema.tables about schema
mysql
mysql-test/suite/funcs_1/t/is_tables_ndb.test:
Check content of information_schema.tables when some
tables are preloaded
Variant for NDB
mysql-test/suite/funcs_1/t/is_triggers.test:
Tests related to functionality of
information_schema.triggers
mysql-test/suite/funcs_1/t/is_user_privileges.test:
Tests related to functionality of
information_schema.user_privileges
mysql-test/suite/funcs_1/t/is_views.test:
Tests related to functionality of
information_schema.views
mysql-test/suite/funcs_1/datadict/basics_mixed3.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/charset_collation.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/columns.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/datadict.pre:
Auxiliary script
mysql-test/suite/funcs_1/datadict/is_table_query.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/statistics.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/table_constraints.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/tables1.inc:
Auxiliary script
mysql-test/suite/funcs_1/datadict/tables2.inc:
Auxiliary script
