summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
Commit message (Collapse)AuthorAgeFilesLines
* Fix for bug #12177 (errorlog file isn't closed)unknown2005-08-041-1/+2
| | | | | | | | | | | | 4.1 version of the patch libmysql/libmysql.c: here we close errorlog file sql/mysql_priv.h: stderror_file declared sql/mysqld.cc: stderror_file saved
* Fix for bug #11329 (lowercase_table.test fails)unknown2005-07-261-44/+44
| | | | | | sql/mysqld.cc: code moved to the init_server_variables() so it will work in embedded server as well
* Simple fixes during review of new codeunknown2005-07-191-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Added floatget() to read unaligned flaot mysql-test/r/select.result: Added test for found_rows() mysql-test/t/select.test: Added test for found_rows() sql/des_key_file.cc: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition sql/field_conv.cc: Added optimizzed varsion of do_cut_string (for simple character sets) sql/item_func.cc: Simplify code (and ensure DBUG_ENTER is excuted before main code) sql/item_strfunc.cc: Safe calculation of max_length This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH) Remove init_des_key_file() as this is not initialized in mysqld.cc sql/item_timefunc.cc: Safe calculation of max_length This was needed as max_length can now be 1<<32-1 (after konstantins recent patch to fix BLOB_LENGTH) sql/log_event.cc: Simplify code sql/mysql_priv.h: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition sql/mysqld.cc: Moved initalization of LOCK_des_key_file to mysqld to make simpler code and avoid theoretical race condition Revert wrong patch of calling close_connection() in first close_connections() loop. (Bug #7403) Instead we now print a warning for closed connections only if mysqld is sarted with --warnings Added comments to make the close_connections() logic clearer sql/sql_prepare.cc: Use floatget() and doubleget() to protect against unaligned data sql/sql_select.cc: Fixed some cases unlikely cases where found_rows() would return wrong for queries that would return 0 or 1 rows
* Fix for BUG#12003 "assertion failure in testsuite (double lock ofunknown2005-07-181-1/+1
| | | | | | | | | | | | | | | | | LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0 for the size of all binlogs but the current one". There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes are very small. Feel free to ask me if you have problems merging them. mysql-test/r/rpl_log.result: correcting binlog sizes mysql-test/r/rpl_rotate_logs.result: correcting binlog sizes sql/mysqld.cc: don't lock LOCK_thread_count when you already have it sql/sql_repl.cc: my_open() needs the complete name, not only the base name
* added a comment referring to the bug reportunknown2005-07-151-0/+6
|
* Bug #7403 error "Forcing close of thread 1 user: 'xxx'"unknown2005-07-141-1/+1
| | | | | | | | | | | The problem was that on Windows, the socket was in a blocking state trying to read. Setting killed=1 is not enough to break the socket out of it's read loop. You have to cancel the read request or close the socket (which close_connection does). sql/mysqld.cc: call close_connection on the thread instead of setting killed=1
* Fixed Bug#11226 and reverted fix for Bug#6993.unknown2005-06-301-1/+1
| | | | | | | | | | | | | | | | | Using 8 bytes for data pointer does not work at least on all computers. The result may become 0 or negative number. (mysqld, myisamchk) myisam/mi_create.c: Fixed Bug#11226, "Dynamic table >4GB issue". mysql-test/r/variables.result: Restricted myisam_data_pointer_size back to 7. mysql-test/t/variables.test: Restricted myisam_data_pointer_size back to 7. sql/mysqld.cc: Restricted myisam_data_pointer_size back to 7.
* Cleanup during review of new codeunknown2005-06-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Fixed wrong allocation that could cause buffer overrun when using join cache myisam/mi_open.c: Fixed indentation mysql-test/r/lowercase_table2.result: Drop tables and databases used in the test mysql-test/t/lowercase_table2.test: Drop tables and databases used in the test mysys/my_fopen.c: Cleanup of comments and parameter names Simple optimization Removed compiler warnings sql/field.cc: Fixed wrong allocation that could cause buffer overrun sql/mysqld.cc: Removed not needed code sql/set_var.cc: Simply code sql/sql_select.cc: Use int2store/int2korr to store length of cached VARCHAR fields (Not dependent on type and faster code as we avoid one possible call)
* Fix Bug#9334 "PS API queries in log file" and unknown2005-06-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#8367 "low log doesn't gives complete information about prepared statements" Implement status variables for prepared statements commands (a port of the patch by Andrey Hristov). See details in comments to the changed files. No test case as there is no way to test slow log/general log in mysqltest. mysql-test/r/ps_grant.result: Now execute is logged with tag 'Execute' (changed result file). sql/mysql_priv.h: - remove obsolete macro. - add declarations for new status variables. - export function log_slow_statement, which now is used in sql_prepare.cc sql/mysqld.cc: Add status variables for prepared statements API: now we record mysql_stmt_close, mysql_stmt_reset, mysql_stmt_prepare, mysql_stmt_execute mysql_stmt_send_long_data, PREPARE, EXECUTE, DEALLOCATE. sql/sql_parse.cc: - account DEALLOCATE prepare as a Com_stmt_close command (close of a prepared statement). sql/sql_prepare.cc: - fix a bug in SQL syntax for prepared statements + logging: if we use --log and EXECUTE stmt USING @no_such_variable;, the server crashed because the old code assumed that the variable returned by get_var_with_binlog is never NULL. - account statistics for mysql_stmt_{prepare,execute,close,reset,send_long_data} in Com_stmt_{prepare,execute,close,reset,send_long_data} correspondingly. - log slow statements into the slow log early, when thd->query points to a valid (with expanded placeholder values) query. The previous version was logging it in sql_parse, when thd->query is empty. Prevent the server from logging the statement twice by setting thd->enable_slow_log= FALSE. - now in case of EXECUTE stmt in SQL syntax for prepared statements the general log gets two queries, e.g. Query EXECUTE stmt USING @a, @b, @c Execute INSERT INTO t1 VALUES (1, 2, 3) This makes the behavior consistent with PREPARE command, which also logs the statement twice.
* A fix for Bug#9141 "4.1 does not log into slow log unknown2005-06-161-3/+16
| | | | | | | | | | | | | | | | | | | | | | | ALTER, OPTIMIZE and ANALYZE statements". In 4.1 we disabled logging of slow admin statements. The fix adds an option to enable it back. No test case (slow log is not tested in the test suite), but tested manually. + post-review fixes (word police mainly). sql/mysql_priv.h: - declaration for a new option sql/mysqld.cc: Add server option '--log-slow-admin-statements' to log slow optimize/alter/etc statements to the slow log if it's enabled. Add warnings that this option works only if the slow log is open. sql/sql_class.h: Rename 'thd->slow_command' to thd->enable_slow_log (negates the meaning of this variable, and so resolves the need to negate value opt_log_slow_admin_statements when setting it). sql/sql_parse.cc: Implement optional logging of administrative statements in the slow log.
* Fix problem with handling of lower_case_table_name == 2 whenunknown2005-06-081-3/+5
| | | | | | | | | | | | | the case in the FROM and WHERE clauses didn't agree. (Bug #9500) mysql-test/r/lowercase_table2.result: Update results mysql-test/t/lowercase_table2.test: Fix 'DROP TABLE' to not drop tables with the same name. sql/mysqld.cc: Move initialization of table_alias_charset to after we have decided what lower_case_table_names should be.
* Move USE_PRAGMA_IMPLEMENTATION to proper placeunknown2005-06-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that 'null_value' is not accessed before val() is called in FIELD() functions Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable mysql-test/r/func_gconcat.result: Move innodb specific test to innodb.test Changed table name r2 -> t2 More test to see how ROLLUP was optimized mysql-test/r/innodb.result: Moved test here form func_gconcat mysql-test/r/olap.result: New test results after optimization mysql-test/t/func_gconcat.test: Move innodb specific test to innodb.test Changed table name r2 -> t2 More test to see how ROLLUP was optimized mysql-test/t/innodb.test: Moved test here form func_gconcat sql/field.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_berkeley.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_blackhole.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_heap.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_innodb.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_isam.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_isammrg.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_myisam.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_myisammrg.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/ha_ndbcluster.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/handler.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/hash_filo.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/item.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/item_cmpfunc.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/item_func.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place Ensure that 'null_value' is not accessed before val() is called sql/item_geofunc.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/item_strfunc.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/item_subselect.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/item_sum.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/item_timefunc.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/item_uniq.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/log_event.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/mysql_priv.h: Change key_map_full to not be const as we are giving it a proper value on startup sql/mysqld.cc: Move key_map variables here and initialize key_map_full properly sql/opt_range.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/opt_range.h: Fix that test_quick_select() works with any ammount of keys sql/procedure.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/protocol.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/protocol_cursor.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/set_var.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_analyse.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_class.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_crypt.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_insert.cc: Fixed that max_rows is ulong sql/sql_list.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_map.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_olap.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_select.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place Fixed that ROLLUP don't have to always create a temporary table Added new argument to remove_const() to make above possible Fixed some errors that creapt up when we don't always do a temporary table for ROLLUP sql/sql_string.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_table.cc: Simple optimizations Fixed wrong checking of build_table_path() in undef-ed code sql/sql_udf.cc: Move USE_PRAGMA_IMPLEMENTATION to proper place sql/sql_yacc.yy: removed extra {}
* Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. ↵unknown2005-06-011-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed a number of dumb things in ha_tina. client/mysqladmin.cc: gcc 4.0 fix sql/examples/ha_archive.cc: Bunch of little cleanups from -Wall and gcc 4.0 fixes sql/examples/ha_example.cc: Noticed that the error call was not quite right. sql/examples/ha_tina.cc: Bunch of cleanups (many of which were quite dumb of me... and I have no earthly idea how they missed everyone's notice). sql/ha_heap.cc: Removed unused variable (-Wall find) sql/item_subselect.cc: Removed unused label. sql/mysqld.cc: Cleanup of unused function and gcc 4.0 bit. sql/opt_range.h: Cleanup for gcc 4.0 sql/repl_failsafe.cc: Cleanup for gcc 4.0 sql/slave.cc: Cleanup for gcc 4.0 sql/sql_acl.cc: Cleanup for gcc 4.0 sql/sql_insert.cc: Cleanedup for gcc 4.0 sql/sql_parse.cc: Cleanedup for gcc 4.0 sql/sql_repl.cc: Removed unused variable sql/sql_select.cc: Cleanedup for gcc 4.0
* Bug #5843: Server code does not check whether PID file was successfully writtenunknown2005-05-051-1/+7
|
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-261-0/+1
|\ | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-261-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-04-061-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 sql/mysqld.cc: Auto merged
| | | * Fixed that create_time is set properly for cached threadsunknown2005-04-061-0/+1
| | | |
* | | | Fix compile issues in Intel C/C++ compiler (Bug #9063)unknown2005-04-251-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE Add test to get type of 'struct rlimit' Switch order of including stdlib.h and declaration being tested to match how it will be used in regular code. configure.in: Call MYSQL_TYPE_STRUCT_RLIMIT macro sql/mysqld.cc: Use STRUCT_RLIMIT for getting type of struct rlimit.
* | | Fixed core dump with long timezone namesunknown2005-04-161-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't abort on bootstrap if a wrong --default-storage-engine is specified sql/handler.cc: Combined code sql/mysqld.cc: Fixed core dump with long timezone names Don't abort on bootstrap if a wrong --default-storage-engine is specified Don't print strange messages if one sends 'kill' to a mysqld --bootstrap sql/set_var.cc: Indentaion change
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-9833unknown2005-04-151-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean sql/mysqld.cc: Auto merged
| * | | Don't allow the server to start up when an invalid user isunknown2005-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified via --user or in configuration. (Bug #9833) sql/mysqld.cc: Actually die if we an invalid user is specified.
* | | | Check that the default storage engine is really available, andunknown2005-04-131-0/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refuse to start up if it is not. (Bug #9815) sql/handler.cc: Add ha_storage_engine_is_enabled function. sql/handler.h: Declare ha_storage_engine_is_enabled() sql/mysqld.cc: Abort startup if the specified default storage engine is not available.
* | | Mergeunknown2005-04-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | sql/mysqld.cc: Auto merged
| * | | Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bitunknown2005-04-131-1/+1
| |/ /
* | | Bug #9665 After registering MySQL service and starting with shared mem, ↵unknown2005-04-081-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot stop Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server sql/mysqld.cc: removed the code that set the shared memory connect event since this also being done in kill_server
* | | Bug #9665 After registering MySQL service and starting with shared mem, ↵unknown2005-04-081-0/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | cannot stop The shared memory connect event was not being set in kill_server. This caused the thread that is handling shared memory connections to never exit. sql/mysqld.cc: Added code to set the shared memory connect event upon server termination
* | Fix handling of max_allowed_packet and net_buffer_length inunknown2005-04-011-10/+3
|/ | | | | | | | | | embedded server when a size suffix (K, M, G) is added. (Bug #9472) sql/mysqld.cc: Instead of (re)parsing max_allowed_packet and net_buffer_length for the embedded server, just set the global variables to what is set in global_system_variables within get_options().
* Remove redundant my_security_attr_free() from unknown2005-03-291-2/+0
| | | | | | | | handle_connections_shared_memory (double free spotted by Monty). sql/mysqld.cc: Remove excessive my_security_attr_free()
* A fix for Bug#8226 "Cannot connect via shared memory": unknown2005-03-261-15/+29
| | | | | | | | | | | | | | | | | | | | | | provide created shared memory objects with proper access rights to make them usable when client and server are running under different accounts. Post review fixes. VC++Files/mysys/mysys.dsp: Add my_windac.c to mysys.lib include/my_sys.h: Declarations for SECURITY_ATTRIBUTES create/destroy functions. mysys/Makefile.am: Add my_windac.c to the list of compiled files. sql-common/client.c: Lower requested access rights for events as the server won't provide clients with ALL access in order to prevent denial of service attack. sql/mysqld.cc: Set proper security attributes for the kernel objects to make them usable when mysqld is running as a Windows service.
* Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-241-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/mysql-4.1 configure.in: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
| * Additional storage engine called "blackhole". Customer request, and for that ↵unknown2005-03-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database. acinclude.m4: New macro rule for ha_blackhole. configure.in: Rule enabling blackhole engine sql/Makefile.am: Additions to Makefile for blackhole engine sql/handler.cc: Ifdef enable code for blackhole (and message for "what does this thing do"). sql/handler.h: Flag for storage engine type. sql/mysql_priv.h: Added blackhole type. sql/mysqld.cc: Updates for building backhole. sql/set_var.cc: Show variable for blackhole engine
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-241-3/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1 sql/mysqld.cc: Auto merged
| * | "After Monty's review" changes to the fix for BUG#8325 "Deadlock in ↵unknown2005-03-231-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replication thread stops replication": s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late); no message on error log (deadlock is too common sometimes), a global counter instead (SHOW STATUS LIKE 'slave_retried_transactions'). Plus a fix for libmysql/Makefile.shared libmysql/Makefile.shared: When we "make clean" in libmysql/ we remove the symlinks there, so we need to mark that they have to be recreated later: this is done by removing ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'. This Makefile.shared is used by libmysql_r too. No reason to remove linked_client_sources as we don't remove the links in client/. mysql-test/r/rpl_deadlock.result: result fix mysql-test/t/rpl_deadlock.test: small test addition sql/mysqld.cc: if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions". sql/slave.cc: If slave retries automatically a transaction, no message on error log (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4, 5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks are usually resolved at first try. New global counter rli->retried_trans (for SHOW STATUS: total number of times the slave had to retry any transaction). safe_sleep() is thread-safe, sleep() was not. I change the rli->trans_retries counter to go from 0 to max instead of the other way (better for new sleep()). sql/slave.h: new global counter rli->retried_trans sql/sql_show.cc: SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes. Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet) when the static global status_vars is created (active_mi is set in init_slave()). sql/structs.h: new SHOW_SLAVE_RETRIED_TRANS BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | BUG#9072 'Max_error_count' system variable cannot be set to zerounknown2005-03-211-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | - Chaned min value in mysqld.cc - Added testcase to warnings.test mysql-test/r/warnings.result: Added testcase for testing max and min value of max_error_count mysql-test/t/warnings.test: Added testcase for testing max and min value of max_error_count sql/mysqld.cc: Change min value of max_error_count from 1 to 0
* | sql/mysqld.ccunknown2005-03-091-1/+4
| | | | | | | | | | | | | | | | preserve backward compatibility sql/mysqld.cc: preserve backward compatibility
* | mysqld.cc:unknown2005-03-081-3/+1
|/ | | | | | | | main(): add missing parameter to printf(ER(ER_READY),...) call sql/mysqld.cc: main(): add missing parameter to printf(ER(ER_READY),...) call
* Fixed crash if max_connections is exceeded. BUG#8996unknown2005-03-071-0/+1
| | | | | | | sql/mysqld.cc: mark the thread as killed in close_connection sql/protocol.cc: don't bother remembering warnings if the thread is dying
* Merge mysql.com:/home/mydev/mysql-4.0unknown2005-03-041-2/+2
|\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 myisam/mi_create.c: Auto merged sql/mysqld.cc: Auto merged
| * typos fixedunknown2005-03-031-2/+2
| |
* | mergeunknown2005-03-031-2/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Auto merged mysys/mf_tempfile.c: Auto merged sql/ha_myisam.cc: Auto merged sql/share/english/errmsg.txt: Auto merged sql/table.cc: Auto merged
| * Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)unknown2005-03-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: O_NOFOLLOW isam/create.c: create table files with O_EXCL|O_NOFOLLOW merge/mrg_create.c: create table files with O_EXCL|O_NOFOLLOW myisam/mi_create.c: create files of temporary tables with O_EXCL|O_NOFOLLOW myisammrg/myrg_create.c: create table files with O_EXCL|O_NOFOLLOW mysys/mf_tempfile.c: create temporary files with O_EXCL|O_NOFOLLOW sql/ha_myisam.cc: let mi_create know if the table is TEMPORARY sql/mysql_priv.h: --allow_suspicious_udfs sql/mysqld.cc: --allow_suspicious_udfs sql/share/english/errmsg.txt: typo sql/sql_udf.cc: --allow_suspicious_udfs don't allow xxx() udf without any of xxx_init/deinit/add/reset check paths when loading from mysql.func sql/table.cc: create frm of temporary table with O_EXCL|O_NOFOLLOW
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-03-021-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.1-clean sql/mysqld.cc: Auto merged
| * | Fix for BUG#8325 "Deadlock in replication thread stops replication":unknown2005-03-021-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded, optionally retry the transaction a certain number of times (new variable --slave_transaction_retries). sql/mysql_priv.h: new var slave_transaction_retries sql/mysqld.cc: new variable slave_transaction_retries. Plus fixing a typo. sql/set_var.cc: new global variable slave_transaction_retries (will be one per subslave, when we have multimaster). sql/slave.cc: Slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded, optionally retry the transaction a certain number of times (--slave_transaction_retries). sql/slave.h: new RELAY_LOG_INFO::trans_retries.
* | | Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info".unknown2005-03-011-1/+1
| | |
* | | Fixed wrong memory references found by purifyunknown2005-02-281-15/+27
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (No really critical errors found, but a few possible wrong results) innobase/dict/dict0dict.c: Replace memcmp with comparison of characters to avoid warnings from purify when 'sptr' points to a very short string mysql-test/r/select_found.result: Add missing drop table mysql-test/r/type_set.result: More tests mysql-test/t/select_found.test: Add missing drop table mysql-test/t/type_set.test: More tests mysys/my_init.c: Avoid warning from purify (purify doesn't handle getrusage() properly) sql/field.h: enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters sql/filesort.cc: enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters sql/item_cmpfunc.cc: Fixed warning from purify. (Not critical as the arguments are passed to a function but not used) Allocate Arg_comparator() with 'new' instead of sql_alloc() to ensure proper initialization sql/mysqld.cc: Wait for signal handler to stop when running --bootstrap (Fixes warning from purify) sql/sql_insert.cc: Initialize slot used by innodb.cc (not critical) sql/sql_lex.h: Better comments sql/sql_repl.cc: memcmp -> bcmp() to avoid warning from purify sql/sql_select.cc: Fix for out-of-bound memory reference when doing DISTINCT on const expressions strings/ctype-simple.c: Fixes to not access uninitialized memory (Not critical)
* | Merge bk-internal:/home/bk/mysql-4.1unknown2005-02-221-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged
| * \ Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1unknown2005-02-221-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged
| | * | BUG#6662: Changes after Guilhems and Sergs reviewunknown2005-02-221-1/+1
| | | |
| | * | BUG#6662: Importing mysqldumps should not show any warnings of level "notes".unknown2005-02-211-1/+2
| | | |