- 11 Nov, 2009 3 commits
-
-
Magne Mahre authored
Add support for being prompted for new passwords by mysqladmin instead of specifying them on the command line. (Bug #5724, patch by Harrison Fisk)
-
Magne Mahre authored
(From: gkodinov) Use and int * where possible to scan for trailing space in a string instead of always iterating char-by-char. Using the attached benchmark file on a 32 bit Intel Core 2 Duo CPU I've got 43485 ms run with the fix compared to 44373 without it. Backported to 5.6.0 (next-mr-runtime) 6.0-codebase revid: 2476.1362.1 include/m_string.h: scan for space through ints strings/ctype-bin.c: scan for space through ints strings/ctype-latin1.c: scan for space through ints strings/ctype-mb.c: scan for space through ints strings/ctype-simple.c: scan for space through ints
-
Davi Arnaut authored
is invalid to preporcessor conditionals. Instead use the autoconf generated macro to test the presence.
-
- 10 Nov, 2009 14 commits
-
-
Davi Arnaut authored
------------------------------------------------------------ revno: 3405 revision-id: davi.arnaut@sun.com-20090626124624-m4wolyo5193j4cu7 parent: luis.soares@sun.com-20090626113019-1j4mn1jos480u9f3 committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: mysql-pe timestamp: Fri 2009-06-26 09:46:24 -0300 message: Bug#45767: deprecate/remove Field::pack_key, Field::unpack_key, Field::pack_cmp Remove unused and dead code. Parts of the patch contributed by Zardosht Kasheff
-
Davi Arnaut authored
------------------------------------------------------------ revno: 2476.784.4 revision-id: sp1r-davi@moksha.local-20071008114751-46069 parent: sp1r-davi@moksha.local-20071003002731-48537 committer: davi@moksha.local timestamp: Mon 2007-10-08 08:47:51 -0300 message: Bug#27249 table_wild with alias: select t1.* as something Aliases to table wildcards are silently ignored, but they should not be allowed as it is non-standard and currently useless. There is not point in having a alias to a wildcard of column names. The solution is to rewrite the select_item rule so that aliases for table wildcards are not accepted. Contribution by Martin Friebe mysql-test/r/alias.result: Add test case result for Bug#27249 mysql-test/t/alias.test: Add test case for Bug#27249 sql/sql_yacc.yy: Split up select_item rule so that aliases for table wildcards are not accepted by the parser.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 2597.4.17 revision-id: sp1r-davi@mysql.com/endora.local-20080328174753-24337 parent: sp1r-anozdrin/alik@quad.opbmk-20080328140038-16479 committer: davi@mysql.com/endora.local timestamp: Fri 2008-03-28 14:47:53 -0300 message: Bug#15192 "fatal errors" are caught by handlers in stored procedures The problem is that fatal errors (e.g.: out of memory) were being caught by stored procedure exception handlers which could cause the execution to not be stopped due to a continue handler. The solution is to not call any exception handler if the error is fatal and send the fatal error to the client. mysql-test/r/sp-error.result: Add test case result for Bug#15192 mysql-test/t/sp-error.test: Add test case for Bug#15192 mysys/my_alloc.c: Pass flag to signal fatal error in memory root allocations. sql/event_data_objects.cc: Use init_sql_alloc to initialize memory roots, which uses the sql error handler to push errors. sql/ha_partition.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/item_func.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/item_subselect.cc: Remove redundant fatal error, memory root already pushes error. sql/opt_sum.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/sp_head.cc: Allocator already sets fatal error. sql/sql_class.h: A error must exist for it to be fatal. Pass flag to signal fatal error instead of calling fatal_error. sql/sql_insert.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/sql_list.h: Pass flag to signal fatal error instead of calling fatal_error. sql/sql_parse.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/sql_partition.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/sql_select.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/sql_servers.cc: Use init_sql_alloc to initialize memory roots, which uses the sql error handler to push errors. sql/sql_show.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/sql_trigger.cc: Use init_sql_alloc to initialize memory roots, which uses the sql error handler to push errors. sql/sql_update.cc: Pass flag to signal fatal error instead of calling fatal_error. sql/tztime.cc: Use init_sql_alloc to initialize memory roots, which uses the sql error handler to push errors.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 3317 revision-id: davi.arnaut@sun.com-20090522170916-fzc5ca3tjs9roy1t parent: patrick.crews@sun.com-20090522152933-ole8s3suy4zqyvku committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: 41860-6.0 timestamp: Fri 2009-05-22 14:09:16 -0300 message: Bug#41860: Without Windows named pipe The problem was that the patch for Bug#10374 broke named pipe and shared memory transports on Windows due to a failure to implement a dummy poll method for transports other than BSD sockets. Another problem was that mysqltest lacked support for named pipe and shared memory connections, which lead to misleading test cases that were supposed run common queries over both transports. The solution is to properly implement, at the VIO layer, the poll and is_connected methods. The is_connected method is implemented for every suppported transport and the poll one only where it makes sense. Furthermore, support for named pipe and shared memory connections is added to mysqltest as to enable testing of both transports using the test suite. client/mysqltest.cc: Add support for named pipe and shared memory connections. include/violite.h: Move private functions to vio/vio_priv.h Add poll_read and is_connected methods. mysql-test/t/named_pipe.test: Run tests over a named pipe connection. mysql-test/t/shm.test: Run tests over a shared memory connection. sql/item_func.cc: Rename method. sql/sql_class.cc: Remove higher-level vio_is_connected implementation. sql/sql_class.h: Rename vio_is_connected to not conflict with the vio one. Verify that there is a valid vio. vio/vio.c: Add poll_read and is_connected methods. vio/vio_priv.h: Add private functions. vio/viosocket.c: Implement the is_connected method for the various transports.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 2597.37.3 revision-id: sp1r-davi@mysql.com/endora.local-20080328123626-16430 parent: sp1r-anozdrin/alik@quad.opbmk-20080327125300-11290 committer: davi@mysql.com/endora.local timestamp: Fri 2008-03-28 09:36:26 -0300 message: Bug#10374 GET_LOCK does not let connection to close on the server side if it's aborted The problem is that the server doesn't detect aborted connections which are waiting on a lock or sleeping (user sleep), wasting system resources for a connection that is already dead. The solution is to peek at the connection every five seconds to verify if the connection is not aborted. A aborted connection is detect by polling the connection socket for available data to be read or end of file and in case of eof, the wait is aborted and the connection killed. include/violite.h: Export vio_peek_read function. mysql-test/r/dirty_close.result: Add test case result for Bug#10374 mysql-test/t/dirty_close.test: Add test case for Bug#10374 sql/item_func.cc: While waiting for a condition to be signaled, check if the connection is not broken every INTERRUPT_INTERVAL seconds. sql/sql_class.cc: Add function which checks if the client connection was aborted. sql/sql_class.h: Add function prototype. vio/viosocket.c: Add poll and peek functions for Windows and Unix.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 2572.2.1 revision-id: sp1r-davi@mysql.com/endora.local-20080227225948-16317 parent: sp1r-anozdrin/alik@quad.-20080226165712-10409 committer: davi@mysql.com/endora.local timestamp: Wed 2008-02-27 19:59:48 -0300 message: Bug#27525 table not found when using multi-table-deletes with aliases over several databas Bug#30234 Unexpected behavior using DELETE with AS and USING The multi-delete statement has a documented limitation that cross-database multiple-table deletes using aliases are not supported because it fails to find the tables by alias if it belongs to a different database. The problem is that when building the list of tables to delete from, if a database name is not specified (maybe an alias) it defaults to the name of the current selected database, making impossible to to properly resolve tables by alias later. Another problem is a inconsistency of the multiple table delete syntax that permits ambiguities in a delete statement (aliases that refer to multiple different tables or vice-versa). The first step for a solution and proper implementation of the cross-databse multiple table delete is to get rid of any ambiguities in a multiple table statement. Currently, the parser is accepting multiple table delete statements that have no obvious meaning, such as: DELETE a1 FROM db1.t1 AS a1, db2.t2 AS a1; DELETE a1 AS a1 FROM db1.t1 AS a1, db2.t2 AS a1; The solution is to resolve the left part of a delete statement using the right part, if the a table on right has an alias, it must be referenced in the left using the given alias. Also, each table on the left side must match unambiguously only one table in the right side. mysql-test/r/delete.result: Add test case result for Bug#27525 and Bug#21148 mysql-test/r/derived.result: Update error. mysql-test/suite/rpl/r/rpl_multi_delete2.result: Update syntax. mysql-test/suite/rpl/t/rpl_multi_delete2.test: Update syntax. mysql-test/t/delete.test: Add test case for Bug#27525 and Bug#21148 mysql-test/t/derived.test: Update statement error, alias is properly resolved now. sql/sql_parse.cc: Implement new algorithm for the resolution of alias in a multiple table delete statement. sql/sql_yacc.yy: Rework multi-delete parser rules to not accept table alias for the table source list. sql/table.h: Add flag to signal that the table has a alias set or that fully qualified table name was given.
-
Davi Arnaut authored
sql/sql_cache.cc: Swap return value description.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 2630.2.13 revision-id: davi@mysql.com-20080612190452-cx6h7rm557bcq7sa parent: davi@mysql.com-20080611124915-csejwrxfdga9upho committer: Davi Arnaut <davi@mysql.com> branch nick: 36785-6.0 timestamp: Thu 2008-06-12 16:04:52 -0300 message: Bug#36785: Wrong error message when group_concat() exceeds max length The problem is that when ER_CUT_VALUE_GROUP_CONCAT is elevated to a error, the message does not get updated with the number of cut lines when group_concat() exceeds max length. The solution is to modify the warning message to be more meaningful by giving the number of the line that was cut and to issue the warning for each line that is cut. This approach is inline with how other per-row truncated data warnings are issued avoids violating the warning internal interface. mysql-test/suite/sys_vars/r/group_concat_max_len_func.result: Update result to reflect the new warning message sql/share/errmsg.txt: Update warning message ER_CUT_VALUE_GROUP_CONCAT.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 2618 revision-id: sp1r-davi@mysql.com/endora.local-20080418131946-26951 parent: sp1r-davi@mysql.com/endora.local-20080417190810-26185 committer: davi@mysql.com/endora.local timestamp: Fri 2008-04-18 10:19:46 -0300 message: Bug#32140: wrong error code caught when an SF() call is interruped with KILL query The problem is that killing a query which calls a stored function could return a wrong error (table corrupt) instead of the query interrupted error message. The solution is to not set the table corrupt error if the query is killed, the query interrupted error message will be set later when the query is finished. sql/sp.cc: Don't set a error if the thread was killed, the query interrupted error will be set later.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 2630.39.3 revision-id: davi.arnaut@sun.com-20081210215359-i876m4zgc2d6rzs3 parent: kostja@sun.com-20081208222938-9es7wl61moli71ht committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: 36649-6.0 timestamp: Wed 2008-12-10 19:53:59 -0200 message: Bug#36649: Condition area is not properly cleaned up after stored routine invocation The problem is that the diagnostics area of a trigger is not isolated from the area of the statement that caused the trigger invocation. In MySQL terms, it means that warnings generated during the execution of the trigger are not removed from the "warning area" at the end of the execution. Before this fix, the rules for MySQL message list life cycle (see manual entry for SHOW WARNINGS) did not apply to statements inside stored programs: - The manual says that the list of messages is cleared by a statement that uses a table (any table). However, such statement, if run inside a stored program did not clear the message list. - The manual says that the list is cleared by a statement that generates a new error or a warning, but this was not the case with stored program statements either and is changed to be the case as well. In other words, after this fix, a statement has the same effect on the message list regardless of whether it's executed inside a stored program/sub-statement or not. This introduces an incompatible change: - before this fix, a, e.g. statement inside a trigger could never clear the global warning list - after this fix, a trigger that generates a warning or uses a table, clears the global warning list - however, when we leave a trigger or a function, the caller's warning information is restored (see more on this below). This change is not backward compatible as it is intended to make MySQL behavior similar to the SQL standard behavior: A stored function or trigger will get its own "warning area" (or, in standard terminology, diagnostics area). At the beginning of the stored function or trigger, all messages from the caller area will be copied to the area of the trigger. During execution, the message list will be cleared according to the MySQL rules described on the manual (SHOW WARNINGS entry). At the end of the function/trigger, the "warning area" will be destroyed along with all warnings it contains, except that if the last statement of the function/trigger generated messages, these are copied into the "warning area" of the caller. Consequently, statements that use a table or generate a warning *will* clear warnings inside the trigger, but that will have no effect to the warning list of the calling (outer) statement. mysql-test/r/sp.result: Fix test case results. mysql-test/r/trigger.result: Fix test case results. mysql-test/t/sp.test: Add test case for Bug#36649 mysql-test/t/trigger.test: Add test case for Bug#36649 sql/sp_head.cc: Emulate multiple warning areas -- one per stored program instance. sql/sql_parse.cc: Message list reset rules are the same for statements inside or outside compound statements.
-
Kristofer Pettersson authored
-
Kristofer Pettersson authored
Correction of backport patch: * Fixed signature of check_access_table() for embedded build * Fixed typo for last argument in a check_access() call from UINT_MAX to 0.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 3624 revision-id: jon.hauglid@sun.com-20090928163426-2lg1gofzz44xzzxf parent: alik@sun.com-20090928050057-r0a62x9czr01q7oe committer: Jon Olav Hauglid <jon.hauglid@sun.com> branch nick: mysql-6.0-codebase-bugfixing-bug47304 timestamp: Mon 2009-09-28 18:34:26 +0200 message: Bug #47304 Test main.mdl_sync fails on embedded server The problem was that SHOW PROCESSLIST was trying to access a thread that was not properly running and therefore had an uninitialized mutex. This patch explicitly resets thd->mysys_var after each embedded server command to prevent the mutex from being accessed in an illegal state. The patch also re-enables lock_multi.test and mdl_sync.test for embedded server as they had been disabled because of this bug.
-
Davi Arnaut authored
------------------------------------------------------------ revno: 2617.31.21 revision-id: davi.arnaut@sun.com-20090402193933-2zbhg15kd0z3xh8r parent: alik@sun.com-20090402081500-78l1hpkx03twe4bf committer: Davi Arnaut <Davi.Arnaut@Sun.COM> branch nick: 41971-6.0 timestamp: Thu 2009-04-02 16:39:33 -0300 message: Bug#41971: Thread state on embedded server is always "Writing to net" The problem is that the state of a thread on a embedded server is always displayed as "Writing to net", which is wrong as there is no "network" in the embedded server. The solution is only exclude, on a embedded server, the thread state conditions that are related to network operations. Other thread states related to waiting on conditions or other operations are preserved. sql/sql_show.cc: Unroll conditionals into a function. Skip check for network operations on the embedded library. Change use of thread_info:: command to retrieve the command directly from the thread handle -- they have the same value.
-
- 05 Nov, 2009 1 commit
-
-
Magne Mahre authored
SIGWINCH is not defined in termios.h on HP/UX.
-
- 04 Nov, 2009 6 commits
-
-
Magne Mahre authored
Added this option, named as "--dump-slave". The purpose of this option is to be able to produce a dump from a slave used for making backups of the master. Originally, dumping from the main master was fine, but as more data accumulated, the dump process would take over 30 minutes, locking up the master database hence website for 30 minutes. A slave dedicated to producing backups was the answer, but I needed a dump that could be used to restore a slave instantly and in order to do that, it has to have three things contained in the dump: 1. "STOP SLAVE;" at the beginning 2. "CHANGE MASTER TO ...<the master - info from 'show slave status'>" 3. "START SLAVE;" at the end These options in this changeset contain this. --stop-slave adds "STOP SLAVE" to the beginning of the dump and "STOP SLAVE" to the end of the dump. --include-host gives the user the option to have the host explicitely added to the "CHANGE MASTER TO ..." line. --dump-slave adds the "CHANGE MASTER ..." to the dump representing not the slave's master binlog info, but the slave's master's info from "SHOW SLAVE STATUS" client/client_priv.h: Added OPT_SLAVE_DATA to client_priv.h client/mysqldump.c: * Added --dump-slave option (name per Brian) * Added --stop-slave to print "STOP SLAVE;" into the dump * Added --include-host option to include "MASTER_HOST=..." and "MASTER_PORT=..." to the dump since unlike --master-data, the host can't be assumed to be the local host * Added do_start_slave and do_stop_slave to stop the slave sql thread upon start of the dump process, and to start the slave sql upon finish of dump process - to keep the log information frozen during this time. * Added do_show_slave_status for obtaining slave information needed to compose "CHANGE MASTER ..." output to the master of this slave. * Added necessary long options and defines required for new options
-
Magne Mahre authored
Feature from Eric Bergen, CLA signed 2007-06-27. Adds new mysql client option "--auto-vertical-output", which causes the client to test whether a result table is too wide for the current window (where available) and emit vertical results in that case. Otherwise, it sends normal tabular results. client/client_priv.h: Add another enum value to client options, for automatic vertical output. client/mysql.cc: Add another command-line option, "auto-vertical-output". Add functions to get the terminal width and functions to get the widths of fields. Use them together to emit vertical output when some output table is too wide to fit in the terminal. If the terminal doesn't support reading its width, then assume 80-positions wide. mysql-test/r/mysql.result: Show that various select statements do work as expected. Wide tables become vertical and narrow ones do not. mysql-test/t/mysql.test: Show that various select statements do work as expected. These should be suitable for a wide range of window capabilities and sizes. Under extreme circumstances, the results could be arbitrary.
-
Jon Olav Hauglid authored
deadlocks Backport of revno: 2617.68.35 The problem was that if one connection is running a multi-statement transaction which involves a single partitioned table, and another connection attempts to alter the table to drop a non-existing partition, (which of course will fail), the first connection still gets ER_LOCK_DEADLOCK and cannot proceed anymore. This bug is no longer reproducable. This has also been tested with the patch for Bug#46654 "False deadlock on concurrent DML/DDL with partitions, inconsistent behavior" which concerned a similar problem but where the ALTER TABLE is semantically correct. Test case added in partition_sync.test.
-
Magne Mahre authored
Another code-path dropped sign of TIME, presuming all time is positive. Minds sign now. Patch depends on ChangeSet for 42661. mysql-test/r/type_time.result: Show we now no longer ignore sign of TIME-type in this code-path. mysql-test/t/type_time.test: Show we now no longer ignore sign of TIME-type in this code-path. sql/item_cmpfunc.cc: TIME_to_ulonglong() (somewhat obviously) loses sign of its argument, so we put it back in where needed.
-
Magne Mahre authored
-
Magne Mahre authored
Bug#42662: maketime() and signedness Item_time_typecast::val_int() dropped sign from MYSQL_TIME gotten using from get_time(). Propagates sign now. Backported to 5.5.0 (6.0-codebase revid: 1810.3897.1)
-
- 03 Nov, 2009 2 commits
-
-
Magne Mahre authored
When less than six places are given for microseconds, we zerofill from the right (leftmost place is always 1/10s). We only did this when all announced date/time fields were given; now we also format fractional seconds when more significant fields are left out. mysql-test/r/func_time.result: show that we treat fractions of seconds correctly (zerofill from right to six places) even if we left out fields on the left mysql-test/t/func_time.test: show that we treat fractions of seconds correctly (zerofill from right to six places) even if we left out fields on the left sql/item_timefunc.cc: format fractions of seconds even if announced more significant fields were left out
-
Magne Mahre authored
The presence of "--skip" parameters is obscure, when it should be obvious from the text. Now, for boolean options, when they're default to ON and the --skip is more useful parameter, then tell the user of its existence. Backported from 6.0-codebase, revid 2572.14.1
-
- 02 Nov, 2009 2 commits
-
-
Alexander Nozdrin authored
```--------------------------------------------------------- revno: 2599.178.12 revision-id: alik@mysql.com-20080812161845-we7cx9f22yrghob1 committer: Alexander Nozdrin <alik@mysql.com> branch nick: 6.0-rt-build timestamp: Tue 2008-08-12 20:18:45 +0400 message: Fix memory leak. ``` ---------------------------------------------------------
-
Alexander Nozdrin authored
-
- 31 Oct, 2009 2 commits
-
-
Alexander Nozdrin authored
-
Alexander Nozdrin authored
-
- 29 Oct, 2009 8 commits
-
-
Marc Alff authored
Backport for 5.5 In non debug builds, the statements: - SHOW PROCEDURE CODE - SHOW FUNCTION CODE used to fail with a "syntax error", which is misleading. These statements have been changed to return the following error for non debug builds: ERROR HY000: The 'SHOW PROCEDURE|FUNCTION CODE' feature is disabled; you need MySQL built with '--with-debug' to have it working For debug builds (./configure --with-debug), nothing is changed.
-
Kristofer Pettersson authored
-
Marc Alff authored
Backport for 5.5
-
Marc Alff authored
-
Marc Alff authored
Backport to 5.5
-
Alexander Nozdrin authored
-
Kristofer Pettersson authored
When the query cache is disabled, the server shouldn't attempt to take the query cache mutex. By using the command line option --query_cache_type=0, the user can disable (backport from mysql-pe) mysql-test/t/query_cache_disabled-master.opt: * added test case for bug38551 mysql-test/t/query_cache_disabled.test: * added test case for bug38551 sql/set_var.cc: * Added before-trigger to verify that query_cache_type wasn't turned off or on during runtime. sql/set_var.h: * Changed order on how the enumeration is processed. By first projecting the character representation of the variable to a temporary integer we can have one function instead of two to check if the value is valid. sql/share/errmsg-utf8.txt: * Added error message for query cache disabled state sql/sql_cache.cc: * If the query cache is disabled at start up, shorten the execution path and avoid grabbing the query cache mutex each time the invalidate interface methods are called. sql/sql_cache.h: * Added new methods to set the query cache into a disabled state.
-
Alexey Botchkov authored
per-file comments: mysql-test/r/mysql_upgrade.result result updated mysql-test/t/mysql_upgrade.test --skip-verbose option added to the call
-
- 28 Oct, 2009 2 commits
-
-
Tor Didriksen authored
-
Tor Didriksen authored
Item_sum::set_aggregator() may be called multiple times during query preparation. On subsequent calls: verify that the aggregator type is the same, and re-use the existing Aggregator. sql/item_sum.cc: In Item_sum::set_aggregator(): re-use existing Aggregator if already set. Remove some friend declarations, add some accessor functions. Cleanup some DBUG_ENTER and DBUG_RETURN code. sql/item_sum.h: Make some member fields private, add accessors instead. Remove some un-necessary friend declarations. Remove some default arguments from constructors. sql/opt_sum.cc: Use accessor functions in Item_sum. sql/sql_select.cc: Fix mis-spelled DBUG_ENTER text. Use accessor functions in Item_sum. sql/sql_yacc.yy: Use explicit true/false rather than default arguments when constructing Item_sum_xxx objects.
-