- 01 Sep, 2005 17 commits
-
-
unknown authored
scripts/Makefile.am: Auto merged
-
unknown authored
Makefile.am: Manual merge: For "test", use Kent's new version using the Perl script with port variables, but also have the "test-force" target (used in the RPM spec!) (still using Shell).
-
unknown authored
mysql-test/t/rpl_slave_status.test: Missing command terminator for source command.
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
-
unknown authored
scripts/Makefile.am: Add "MYSQL_BASE_VERSION" to the list of substituted variables, for later (possible) use in "mysql_install_db" and "mysqld_safe".
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316 mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/create_select_tmp.test: Auto merged mysql-test/t/drop.test: Auto merged mysql-test/t/flush.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/innodb-deadlock.test: Auto merged mysql-test/t/innodb-lock.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/ndb_autodiscover2.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl_EE_error.test: Auto merged mysql-test/t/rpl_change_master.test: Auto merged mysql-test/t/rpl_deadlock.test: Auto merged mysql-test/t/rpl_drop.test: Auto merged mysql-test/t/rpl_drop_temp.test: Auto merged mysql-test/t/rpl_error_ignored_table.test: Auto merged mysql-test/t/rpl_flush_log_loop.test: Auto merged mysql-test/t/rpl_insert_id.test: Auto merged mysql-test/t/rpl_loaddata.test: Auto merged mysql-test/t/rpl_rotate_logs.test: Auto merged mysql-test/t/rpl_until.test: Auto merged client/mysqltest.c: Manual merge mysql-test/t/mysqltest.test: Manual merge
-
unknown authored
into mysql.com:/home/dlenev/src/mysql-4.1-bg12423 sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged mysql-test/r/grant2.result: Manual merge. mysql-test/t/grant2.test: Manual merge.
-
unknown authored
multi-threaded environment". To avoid deadlocks between several simultaneously run account management commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT commands) we should always take table and internal locks during their execution in the same order. In other words we should first open and lock privilege tables and only then obtain acl_cache::lock/LOCK_grant locks. mysql-test/r/grant2.result: Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in multi-threaded environment". mysql-test/t/grant2.test: Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in multi-threaded environment". sql/mysqld.cc: acl_init/grant_init() are now used only at server start up so they always allocate temporary THD object and don't need argument for passing pointer to it. sql/sql_acl.cc: To avoid deadlocks between several simultaneously run account management commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT commands) we should always take table and internal locks during their execution in the same order. In other words we should first open and lock privilege tables and only then obtain acl_cache::lock/LOCK_grant locks. Changed acl_reload()/grant_reload() and change_password()/update_user_table() in such way that they obey this principle. Now in acl_reload()/grant_reload()/ change_password() we open and lock privilege tables, then obtain internal locks and then call acl_load()/grant_load()/update_user_table() functions to do actual loading or updating. sql/sql_acl.h: acl_init/grant_init() are now used only at server start up so they always allocate temporary THD object and don't need argument for passing pointer to it. acl_reload()/grant_reload() now are able to report about their success or failure through return value. sql/sql_parse.cc: If reload_acl_and_cache() is called from SIGHUP handler we have to allocate temporary THD for execution of acl_reload()/grant_reload().
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
-
unknown authored
Make sure mtr_kill_processes() is called with an array ref Corrected error string for STDERR redirect mysql-test/lib/mtr_process.pl: Make sure mtr_kill_processes() is called with an array ref
-
unknown authored
client/mysqltest.c: Fix warnings Remove unused vars
-
unknown authored
client/mysqltest.c: Fix function var_copy to make it possible to assign one variable to another. ex: let $1=$2 mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Add test cases for variable to variable assignment
-
unknown authored
- Move clearing of expected errors client/mysqltest.c: Move clear of expected errors to the query loop so that the expected error is reset even when the query is retrieved from the q_lines cache. mysql-test/r/mysqltest.result: Update test results mysql-test/t/mysqltest.test: Add test for bug#12471
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-4.1 sql/examples/ha_archive.cc: Auto merged
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
on Windows. (Bug #12325) mysql-test/r/lowercase_table.result: Update results mysql-test/t/lowercase_table.test: Move test to new windows.test, since it is Windows-specific mysys/my_access.c: Check that we've matched the whole forbidden name. mysql-test/include/windows.inc: New BitKeeper file ``mysql-test/include/windows.inc'' mysql-test/r/windows.result: New BitKeeper file ``mysql-test/r/windows.result'' mysql-test/t/windows.test: New BitKeeper file ``mysql-test/t/windows.test''
-
- 31 Aug, 2005 17 commits
-
-
unknown authored
-
unknown authored
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
-
unknown authored
-
unknown authored
into moonbone.local:/work/12861-bug-4.1-mysql
-
unknown authored
-
unknown authored
on Solaris even though it is available, and declare it ourselves in that case. (Bug #7156) configure.in: Add test for madvise() being declared when C++ compiler is used. include/my_global.h: Handle madvise() being available but not declared in C++ isam/extra.c: Fix typo in define test myisam/mi_extra.c: Fix typo in define test sql/examples/ha_tina.cc: Test that we have madvise() before trying to call it.
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
-
unknown authored
Use !<err_no> instead client/mysqltest.c: Remove syntax !$<err_no> to set an expected error code mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Uncomment tests for the deprecated syntax
-
unknown authored
- Add stricter checking of syntax in mysqltest client/mysqltest.c: Stricter checking of syntax in mysqltest. mysql-test/r/mysqltest.result: Update test results mysql-test/t/create.test: Remove extra ; mysql-test/t/create_select_tmp.test: Remove extra ; mysql-test/t/drop.test: Remove extra ; mysql-test/t/flush.test: Remove extra ; mysql-test/t/handler.test: Remove extra ; mysql-test/t/innodb.test: Remove extra ; mysql-test/t/mysqltest.test: Add more tests for replace, replace_columns, comments with commands and sync_with_master mysql-test/t/rpl000001.test: Remove extra ; mysql-test/t/rpl_EE_error.test: Remove extra ; mysql-test/t/rpl_drop.test: Remove extra ; mysql-test/t/rpl_error_ignored_table.test: Remove extra ; mysql-test/t/rpl_loaddata.test: Remove extra ;
-
unknown authored
Backporting from 5.0 mysql-test/mysql-test-run.pl: Backporting from 5.0 mysql-test/lib/mtr_process.pl: Backporting from 5.0 mysql-test/lib/mtr_report.pl: Backporting from 5.0 mysql-test/lib/mtr_timer.pl: Backporting from 5.0
-
unknown authored
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to 1 only if some of it's arguments may be null. When used in subquery in tmp table created field which can't be null. When no data retireved result field have to be set to null and error mentioned in bug report occurs. Also this bug can occur if selecting from not null field in empty table. Function group_concat now marked maybe_null from the very beginning not only if some of it's argument may be null. sql/item_sum.cc: Fix bug #12861 client hang with group_concat insubquery FROM DUAL. mysql-test/r/func_gconcat.result: Test case for bug #12861 client hang with group_concat insubquery FROM DUAL. mysql-test/t/func_gconcat.test: Test case for bug #12861 client hang with group_concat insubquery FROM DUAL.
-
unknown authored
-
unknown authored
Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago sql/ha_innodb.cc: Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago
-
unknown authored
Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it sql/ha_innodb.cc: Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
-
unknown authored
-
- 30 Aug, 2005 6 commits
-
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
sql/item.cc: Auto merged sql/sql_select.cc: manual merge
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
include/my_alloc.h: Fix incorrect spelling mysql-test/t/rpl000009.test: Fix incorrect spelling mysql-test/t/system_mysql_db_fix.test: Fix incorrect spelling sql/sql_table.cc: Fix incorrect spelling tests/mysql_client_test.c: Fix incorrect spelling
-
unknown authored
into zim.(none):/home/brian/mysql/mysql-4.1
-