mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
41536fcefe
tree to get rid of multiple typos in CS comments and unify the patch. configure.in: CSV is compiled in by default now include/my_base.h: add new ha_extra flag for the log tables mysql-test/include/im_check_os.inc: we should only run im tests if csv is on for now: im relies on mysqld options available only in csv build. mysql-test/include/system_db_struct.inc: check log tables structure mysql-test/lib/init_db.sql: create log tables when running tests. mysql-test/mysql-test-run.pl: Add old logs flag to IM tests. As IM could only deal with old logs (this feature is not needed with log tables) mysql-test/r/connect.result: update result mysql-test/r/csv.result: update result mysql-test/r/im_utils.result: update result mysql-test/r/information_schema.result: update result mysql-test/r/mysqlcheck.result: update result mysql-test/r/show_check.result: update result mysql-test/r/system_mysql_db.result: update result mysql-test/t/connect.test: disable test if CSV engine is not in: result depends on the presence of CSV-based log tables mysql-test/t/csv.test: add tests for concurrent insert (the functionality is added to CSV in this patch) mysql-test/t/information_schema.test: disable test if CSV engine is not in: result depends on the presence of CSV-based log tables mysql-test/t/mysqlcheck.test: disable test if CSV engine is not in: result depends on the presence of CSV-based log tables mysql-test/t/show_check.test: disable test if CSV engine is not in: result depends on the presence of CSV-based log tables mysql-test/t/system_mysql_db.test: disable test if CSV engine is not in: result depends on the presence of CSV-based log tables mysql-test/t/system_mysql_db_fix.test: disable test if CSV engine is not in: result depends on the presence of CSV-based log tables scripts/mysql_create_system_tables.sh: new system tables: slow_log and general_log scripts/mysql_fix_privilege_tables.sql: add new log tables: use an SP to create them for non-csv build to work fine. sql/ha_myisam.cc: move locking-related checks to the hanlder sql/ha_myisam.h: new function declared sql/handler.h: new virtual function is added: we should check for handler-related locking issues in the handler sql/lock.cc: from now on we check for handler-related locking issues in the handler itself rather then in lock.cc sql/log.cc: Add log tables support, refactoring: there are log event handlers with common interface. They are used by the LOGGER class, which is responsible for their initialization, cleanup and managment. Logging to the tables provided by one of the log event handler types. sql/log.h: declare new log classes sql/log_event.cc: convert old logging routines calls to use new API sql/mysql_priv.h: define common log routines and objects sql/mysqld.cc: Add support for the log tables. Their initalization, cleanup and specific options. sql/share/errmsg.txt: add new error messages for the log tables sql/slave.cc: convert old logging routines calls to use new API sql/sql_base.cc: TABLE objects used by the logger should be skipped during refreshes (as log tables are always opened and locked). fix table_is_used to skip them. This is needed for FLUSH LOGS to work sql/sql_db.cc: convert old logging routines calls to use new API sql/sql_delete.cc: fix TRUNCATE to work with log tables sql/sql_parse.cc: command_name is now an array of LEX_STRINGs sql/sql_prepare.cc: convert old logging routines calls to use new API sql/sql_show.cc: convert old logging routines calls to use new API sql/sql_table.cc: don't reoped the log tables for admin purposes sql/table.cc: mark log tables as such during the open sql/table.h: add log-related info storage/csv/ha_tina.cc: add support for concurrent insert (see bk commit - 5.1 tree (petr:1.1910) for standalone patch), add log tables-specific csv table handling. storage/csv/ha_tina.h: enable concurrent insert for CSV, add log table flag mysql-test/r/log_tables.result: New BitKeeper file ``mysql-test/r/log_tables.result'' mysql-test/t/log_tables.test: New BitKeeper file ``mysql-test/t/log_tables.test''
104 lines
3.2 KiB
Text
104 lines
3.2 KiB
Text
# This test is to check various cases of connections
|
|
# with right and wrong password, with and without database
|
|
# Unfortunately the check is incomplete as we can't connect without database
|
|
|
|
# This test makes no sense with the embedded server
|
|
--source include/not_embedded.inc
|
|
|
|
# check that CSV engine was compiled in, as the test relies on the presence
|
|
# of the log tables (which are CSV-based). By connect mysql; show tables;
|
|
--source include/have_csv.inc
|
|
|
|
--disable_warnings
|
|
drop table if exists t1,t2;
|
|
--enable_warnings
|
|
|
|
|
|
#connect (con1,localhost,root,,"");
|
|
#show tables;
|
|
connect (con1,localhost,root,,mysql);
|
|
show tables;
|
|
connect (con2,localhost,root,,test);
|
|
show tables;
|
|
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,root,z,test2);
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,root,z,);
|
|
|
|
grant ALL on *.* to test@localhost identified by "gambling";
|
|
grant ALL on *.* to test@127.0.0.1 identified by "gambling";
|
|
|
|
# Now check this user with different databases
|
|
#connect (con1,localhost,test,gambling,"");
|
|
#show tables;
|
|
connect (con3,localhost,test,gambling,mysql);
|
|
show tables;
|
|
connect (con4,localhost,test,gambling,test);
|
|
show tables;
|
|
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,test,,test2);
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,test,,"");
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,test,zorro,test2);
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,test,zorro,);
|
|
|
|
|
|
# check if old password version also works
|
|
update mysql.user set password=old_password("gambling2") where user=_binary"test";
|
|
flush privileges;
|
|
|
|
connect (con10,localhost,test,gambling2,);
|
|
connect (con5,localhost,test,gambling2,mysql);
|
|
set password="";
|
|
--error 1372
|
|
set password='gambling3';
|
|
set password=old_password('gambling3');
|
|
show tables;
|
|
connect (con6,localhost,test,gambling3,test);
|
|
show tables;
|
|
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,test,,test2);
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,test,,);
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,test,zorro,test2);
|
|
--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
|
|
--error 1045
|
|
connect (fail_con,localhost,test,zorro,);
|
|
|
|
|
|
# remove user 'test' so that other tests which may use 'test'
|
|
# do not depend on this test.
|
|
|
|
delete from mysql.user where user=_binary"test";
|
|
flush privileges;
|
|
|
|
#
|
|
# Bug#12517: Clear user variables and replication events before
|
|
# closing temp tables in thread cleanup.
|
|
connect (con7,localhost,root,,test);
|
|
connection con7;
|
|
create table t1 (id integer not null auto_increment primary key);
|
|
create temporary table t2(id integer not null auto_increment primary key);
|
|
set @id := 1;
|
|
delete from t1 where id like @id;
|
|
disconnect con7;
|
|
--sleep 5
|
|
connection default;
|
|
drop table t1;
|
|
|
|
# End of 4.1 tests
|