summaryrefslogtreecommitdiff
path: root/mysql-test/r
Commit message (Collapse)AuthorAgeFilesLines
* Merge sita.local:/Users/tsmith/m/bk/41unknown2007-07-091-1/+55
|\ | | | | | | | | | | | | into sita.local:/Users/tsmith/m/bk/maint/41
| * loaddata.result, loaddata.test:unknown2007-07-031-10/+1
| | | | | | | | | | | | | | | | | | | | Test case update for bug #29294. mysql-test/t/loaddata.test: Test case update for bug #29294. mysql-test/r/loaddata.result: Test case update for bug #29294.
| * Fixed bug #29294.unknown2007-07-031-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `SELECT 'r' INTO OUTFILE ... FIELDS ENCLOSED BY 'r' ' statement encoded the 'r' string to a 4 byte string of value x'725c7272' (sequence of 4 characters: r\rr). The LOAD DATA statement decoded this string to a 1 byte string of value x'0d' (ASCII Carriage Return character) instead of the original 'r' character. The same error also happened with the FIELDS ENCLOSED BY clause followed by special characters: 'n', 't', 'r', 'b', '0', 'Z' and 'N'. NOTE 1: This is a result of the undocumented feature: the LOAD DATA INFILE recognises 2-byte input sequences like \n, \t, \r and \Z in addition to documented 2-byte sequences: \0 and \N. This feature should be documented (here backspace character is a default ESCAPED BY character, in the real-life example it may be any ESCAPED BY character). NOTE 2, changed behaviour: Now the `SELECT INTO OUTFILE' statement with the `FIELDS ENCLOSED BY' clause followed by one of: 'n', 't', 'r', 'b', '0', 'Z' or 'N' characters encodes this special character itself by doubling it ('r' --> 'rr'), not by prepending it with an escape character. sql/sql_class.h: Fixed bug #29294. The ESCAPE_CHARS macro constant is defined to enumerate symbolic names of espace-sequences like '\n', '\t' etc. The select_export::is_ambiguous_field_sep field has been added to distinguish special values of the field_sep field from another values (see ESCAPE_CHARS). sql/sql_class.cc: Fixed bug #29294. The select_export::send_data method has been modified to encode special values of the field_sep field by doubling of those values instead of prepending them with a value of the escape_char field. Example: The SELECT 'r' INTO OUTFILE FIELDS ENCLOSED BY 'r' now produces the 'rr' output string instead of x'5c72' (i.e. instead of sequence of 2 bytes: \ and r). sql/sql_load.cc: Fixed bug #29294. Added commentary for the READ_INFO::unescape method. mysql-test/t/loaddata.test: Updated test case for bug #29294. mysql-test/r/loaddata.result: Updated test case for bug #29294.
* | Merge maint1.mysql.com:/data/localhome/tsmith/bk/41unknown2007-07-041-0/+23
|\ \ | |/ | | | | | | | | | | into maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
| * Fixed bug #29251.unknown2007-06-271-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes special 0 ENUM values was ALTERed to normal empty string ENUM values. Special 0 ENUM value has the same string representation as normal ENUM value defined as '' (empty string). The do_field_string function was used to convert ENUM data at an ALTER TABLE request, but this function doesn't care about numerical "indices" of ENUM values, i.e. do_field_string doesn't distinguish a special 0 value from an empty string value. A new copy function called do_field_enum has been added to copy special 0 ENUM values without conversion to an empty string. sql/field_conv.cc: Fixed bug #29251. The Copy_field::get_copy_func method has been modified to return a pointer to the do_field_enum function if a conversion between two columns of incompatible enum types is required. The do_field_enum function has been added for the correct conversion of special 0 enum values. mysql-test/t/type_enum.test: Updated test case for bug #29251. mysql-test/r/type_enum.result: Updated test case for bug #29251.
* | Merge maint1.mysql.com:/data/localhome/tsmith/bk/41unknown2007-06-261-0/+1
|\ \ | |/ |/| | | | | | | | | into maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
| * Merge bk-internal:/home/bk/mysql-4.1-maintunknown2007-06-191-0/+1
| |\ | | | | | | | | | | | | | | | | | | into pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
| | * WL#3232 mysqltest, enable --source $variables/<remaining_path_to_file>unknown2007-06-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add test case for this already existing feature mysql-test/r/mysqltest.result: Update result file mysql-test/t/mysqltest.test: Add test case for this feature
* | | Bug #29116: Test "rpl_change_master" returns different unknown2007-06-191-4/+66
|/ / | | | | | | | | | | | | | | | | | | | | | | counters from relay Updated the test to return columns vertically. mysql-test/r/rpl_change_master.result: Bug #29116: test updated mysql-test/t/rpl_change_master.test: Bug #29116: test updated
* | Merge bk@192.168.21.1:mysql-4.1unknown2007-06-141-0/+2
|\ \ | |/ |/| | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-4.1-opt
| * Bug#28553 mysqld crash in "purge master log before(select time from ↵unknown2007-06-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | information_schema)" forbid the use of subselect in PURGE LOGS BEFORE command mysql-test/r/subselect.result: test result mysql-test/t/subselect.test: test case sql/sql_yacc.yy: forbid the use of subselect in PURGE LOGS BEFORE command
* | Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_valueunknown2007-06-011-0/+39
|\ \ | |/ |/| | | | | | | | | into pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
| * Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test ↵unknown2007-06-011-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failures - Add funtion "query_get_value to allow reading a fields value into a $variable client/mysqltest.c: - Add function "let $var= query_get_value(<query>,<colname>,<row>)" making it possible to read a value from a specific field in a query into a $variable. mysql-test/r/mysqltest.result: Add test cases for "query_get_value" mysql-test/t/mysqltest.test: Add test cases for "query_get_value"
* | Merge mysql.com:/home/svoj/devel/bk/mysql-4.1unknown2007-05-231-0/+4
|\ \ | |/ |/| | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
| * BUG#27998 - mysqld crashed when executing INSERT DELAYEDunknown2007-04-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on a BLACKHOLE table Using INSERT DELAYED on BLACKHOLE tables could lead to server crash. This happens because delayed thread wants to upgrade a lock, but BLACKHOLE tables do not have locks at all. This patch rejects attempts to use INSERT DELAYED on MERGE tables. mysql-test/r/blackhole.result: A test case for BUG#27998. mysql-test/t/blackhole.test: A test case for BUG#27998. sql/ha_blackhole.h: Removed HA_CAN_INSERT_DELAYED flag from table_flags(). The insert delayed thread upgrades the lock. Hence it is incapable to handle BLACKHOLE tables, which do not have locks at all.
* | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41unknown2007-05-212-0/+43
|\ \ | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
| * \ Merge bk@192.168.21.1:mysql-4.1unknown2007-05-182-0/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-4.1-opt
| | * | Fixed bug #28272: crash that occurs when running an EXPLAIN commandunknown2007-05-141-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for a query over an empty table right after its creation. The crash is the result of an attempt made by JOIN::optimize to evaluate the WHERE condition when no records have been actually read. The added test case can reproduce the crash only with InnoDB tables and only with 5.0.x. mysql-test/r/innodb_mysql.result: Added a test case for bug #28272. mysql-test/t/innodb_mysql.test: Added a test case for bug #28272. sql/sql_select.cc: Fixed bug #28272: crash that occurs when running an EXPLAIN command for a query over an empty table right after its creation. The crash is the result of an attempt made by JOIN::optimize to evaluate the WHERE condition when no records have been actually read. Such attempts could be observed only with EXPLAIN commands. Now at the optimization phase the WHERE condition is never evaluated if there is no record previously read from the table.
| | * | Fixed bug #27937: crash for the the second execution of a preparedunknown2007-05-141-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement from a UNION query with ORDER BY an expression containing RAND(). The crash happened because the global order by list in the union query was not re-initialized for execution. (Local order by lists were re-initialized though). mysql-test/r/ps.result: Added a test case for bug #27937. mysql-test/t/ps.test: Added a test case for bug #27937. sql/sql_union.cc: Fixed bug #27937: crash for the the second execution of a prepared statement from a UNION query with ORDER BY an expression containing RAND(). The crash happened because the global order by list in the union query was not re-initialized for execution. (Local order by lists were re-initialized though). Added re-initialization of the global order by list in the function st_select_lex_unit::init_prepare_fake_select_lex.
* | | | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2007-05-183-0/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
| * \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/41unknown2007-05-173-0/+108
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/41
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-05-151-0/+52
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into vajra.(none):/opt/local/work/mysql-4.1-runtime
| | | * | Bug #27792 query cache returns wrong result, with certain system variablesunknown2007-05-081-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Queries in the query cache are identified by the individual characters in the query statement, the current database and the current environment expressed as a set of system variable flags. - Since the set of environment flags didn't properly describe the current environment unexpected results were returned from the query cache. - Query cache is now cleared when the variable ft_boolean_syntax is updated. - An identification flag for the variable default_week_format is added to the query cache record. Thanks to Martin Friebe who has supplied significant parts of this patch. mysql-test/r/query_cache.result: Added test case mysql-test/t/query_cache.test: Added test case sql/mysql_priv.h: - Added missing flags to reflect the significant local environment settings of the cached query. sql/set_var.cc: - Added query cache flush when system variable ft_boolean_syntax is updated since this also invalidates all cached result sets using this variable. sql/sql_cache.cc: - Added another local system variable as an identification flag for cached queries.
| | * | | Bug #27531: the 4.1 fix.unknown2007-05-041-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking for applicability of join cache we must disable its usage only if there is no temp table in use. When a temp table is used we can use join cache (and it will not make the result-set unordered) to fill the temp table. The filesort() operation is then applied to the data in the temp table and hence is not affected by join cache usage. Fixed by narrowing the condition for disabling join cache to exclude the case where temp table is used. mysql-test/r/join.result: Bug #27531: test case mysql-test/t/join.test: Bug #27531: test case sql/sql_select.cc: Bug #27531: Disable join cache only if not using temp table
| | * | | Bug#23656: Wrong conversion result of a DATETIME to integer using CAST function.unknown2007-05-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generic string to int conversion was used by the Item_func_signed and the Item_func_unsigned classes to convert DATE/DATETIME values to the SIGNED/UNSIGNED type. But this conversion produces wrong results for such values. Now if the item which result has to be converted can return its result as longlong then the item->val_int() method is used to allow the item to carry out the conversion itself and return the correct result. This condition is checked in the Item_func_signed::val_int() and the Item_func_unsigned::val_int() functions. mysql-test/t/cast.test: Added a test case for the bug#23656: Wrong conversion result of a DATETIME to integer using CAST function. mysql-test/r/cast.result: Added a test case for the bug#23656: Wrong conversion result of a DATETIME to integer using CAST function. sql/item_func.cc: Bug#23656: Wrong conversion result of a DATETIME to integer using CAST function. Now if the item which result has to be converted can return its result as longlong then the item->val_int() method is used to allow the item to carry out the conversion itself and return the correct result. This condition is checked in the Item_func_signed::val_int() and the Item_func_unsigned::val_int() functions.
* | | | | WL#2247 mysqltest: add option for sorting resultsunknown2007-05-181-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Final touchups client/mysqltest.c: Final touch ups, rename sorted_results to sorted_result mysql-test/r/mysqltest.result: Update test result mysql-test/t/mysqltest.test: Update results with additional subtests for empty result set, NULL values and 1024 rows
* | | | | WL#2247 mysqltest: add option for sorting resultsunknown2007-05-161-0/+52
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change from "query_sorted <query>" to "sorted_results" client/mysqltest.c: Replace "query_sorted <query>" with the ability to turn on "one shot result sorting" with the command "sorted_results" mysql-test/r/mysqltest.result: Update test and result mysql-test/t/mysqltest.test: Update test and result
* | | | Bug #27976: Misleading error message, 'Sort buffer to small'unknown2007-05-041-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message is gramatically wrong, and factually wrong. Change it to refer to the myisam_sort_buffer_size variable and change "to" to "too". myisam/sort.c: Change error messages to be gramatically correct and to refer to the correct variable. mysql-test/r/repair.result: Refer to the correct variable. Message changed.
* | | Fixed bug #24856: the result set of a ROLLUP query with DISTINCT could lackunknown2007-04-291-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some rollup rows (rows with NULLs for grouping attributes) if GROUP BY list contained constant expressions. This happened because the results of constant expressions were not put in the temporary table used for duplicate elimination. In fact a constant item from the GROUP BY list of a ROLLUP query can be replaced for an Item_null_result object when a rollup row is produced . Now the JOIN::rollup_init function wraps any constant item referenced in the GROYP BY list of a ROLLUP query into an Item_func object of a special class that is never detected as constant item. This ensures creation of fields for such constant items in temporary tables and guarantees right results when the result of the rollup operation first has to be written into a temporary table, e.g. in the cases when duplicate elimination is required. mysql-test/r/olap.result: Added a test case for bug #24856. mysql-test/t/olap.test: Added a test case for bug #24856. sql/item_func.h: Fixed bug #24856: the result set of a ROLLUP query with DISTINCT could lack some rollup rows (rows with NULLs for grouping attributes) if GROUP BY list contained constant expressions. Itroduced class Item_func_rollup_const derived from Item_func. The object of this class are never detected as constant items. We use them for wrapping constant items from the GROUP BY list of any ROLLUP query. This wrapping allows us to ensure writing constant items into temporary tables whenever the result of the ROLLUP operation has to be written into a temporary table, e.g. when ROLLUP is used together with DISTINCT in the SELECT list. sql/sql_select.cc: Fixed bug #24856: the result set of a ROLLUP query with DISTINCT could lack some rollup rows (rows with NULLs for grouping attributes) if GROUP BY list contained constant expressions. Now the JOIN::rollup_init function wraps any constant item referenced in the GROYP BY list of a ROLLUP query into an Item_func object of a special class that is never detected as constant item. This ensures creation of fields for such constant items in temporary tables and guarantees right results when the result of the rollup operation first has to be written into a temporary table, e.g. in the cases when duplicate elimination is required.
* | | Merge bk@192.168.21.1:mysql-4.1unknown2007-04-293-1/+39
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-4.1-opt
| * | Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-optunknown2007-04-291-0/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-13191
| | * | Fixed bug #13191.unknown2007-04-291-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INSERT...ON DUPLICATE KEY UPDATE may cause error 1032: "Can't find record in ..." if we are inserting into InnoDB table unique index of partial key with underlying UTF-8 string field. This error occurs because INSERT...ON DUPLICATE uses a wrong procedure to copy string fields of multi-byte character sets for index search. mysql-test/t/innodb_mysql.test: Added test case for bug #13191. mysql-test/r/innodb_mysql.result: Added test case for bug #13191. sql/field.h: Fixed bug #13191. Field_string::get_key_image() virtual function was overloaded to implement copying of variable length character (UTF-8) fields. Field::get_key_image() function prototype has been changed to return byte size of copied data. sql/field.cc: Fixed bug #13191. Field_string::get_key_image() virtual function was overloaded to implement copying of variable length character (UTF-8) fields. Field::get_key_image() function prototype has been changed to return byte size of copied data. sql/key.cc: Fixed bug #13191. INSERT...ON DUPLICATE KEY UPDATE may cause error 1032: "Can't find record in ...". This error occurs because INSERT...ON DUPLICATE uses a wrong procedure to copy field parts for index search. key_copy() function has been fixed.
| * | | Adjusted results after the fix for bug #20710.unknown2007-04-291-1/+1
| | | |
| * | | Fixed bug #20710.unknown2007-04-291-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug occurs when error message length exceeds allowed limit: my_error() function outputs "%s" sequences instead of long string arguments. Formats like %-.64s are very common in errmsg.txt files, however my_error() function simply ignores precision of those formats. mysys/my_error.c: Fixed bug #20710. This bug occurs when error message length exceeds allowed limit: my_error() function output "%s" sequences instead of long string arguments. my_error() function has been fixed to accept formats like %-.64s. mysql-test/t/alter_table.test: Added test case for bug #20710. mysql-test/r/alter_table.result: Added test case for bug #20710.
* | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-04-272-0/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
| * \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginesunknown2007-04-181-0/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-4.1-engines
| | * | | BUG#25951 - ignore/use index does not work with fulltextunknown2007-04-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IGNORE/USE/FORCE INDEX hints were honored when choosing FULLTEXT index. With this fix these hints are ignored. For regular indexes we may perform table scan instead of index lookup when IGNORE INDEX was specified. We cannot do this for FULLTEXT in NLQ mode. mysql-test/r/fulltext.result: A test case for bug#25951. mysql-test/t/fulltext.test: A test case for bug#25951. sql/item_func.cc: IGNOR/USE/FORCE INDEX hints should not be honored when choosing FULLTEXT index. Use proper bitmap, that is not modified by IGNORE/USE/FORCE INDEX hints.
| * | | | BUG#24342 - Incorrect results with query over MERGE tableunknown2007-04-111-0/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE engine may return incorrect values when several representations of equal keys are present in the index. For example "groß" and "gross" or "gross" and "gross " (trailing space), which are considered equal, but have different lengths. The problem was that key length was not recalculated after key lookup. Only MERGE engine is affected. myisam/mi_rkey.c: info->lastkey gets rewritten by mi_search. Later we recalculate found lastkey length. This is done to make sure that mi_rnext_same gets true, found (not searched) lastkey length. Searched and found key lengths may be different, for example in case searched key is "groß" and found is "gross" or in case a key has trailing spaces. Unfortunately we recalculate found lastkey length only for first underlying table. To recalculate found key length for non-first underlying table we need to know how much key segments were used to create this key. When mi_rkey is called for first underlying table of a merge table, store offset to last used key segment. Restore last_used_keyseg variable when mi_rkey is called for non-first underlying table. myisam/myisamdef.h: Added last_used_keyseg variable to MI_INFO. It is used by merge engine to calculate key length. myisammrg/myrg_rkey.c: Pass last used key segment returned by first table key read to other table key reads. mysql-test/r/merge.result: A test case for bug#24342. mysql-test/t/merge.test: A test case for bug#24342.
* | | | Merge trift-lap.fambruehe:/MySQL/M41/mysql-4.1unknown2007-04-261-44/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M41/push-4.1
| * \ \ \ Merge debian.(none):/M41/mysql-4.1unknown2007-04-232-3/+100
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into debian.(none):/M41/push-4.1
| * | | | Merge trift2.:/MySQL/M41/test-help-4.1unknown2007-04-171-44/+44
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M41/push-4.1
| | * | | Test "help": unknown2007-03-201-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shift the ID values up into a range where they will not collide with those which we use for real data, when we fill the system tables. Will be merged up to 5.0 where it is needed for 5.0.38. mysql-test/r/help.result: Fix the result file according to the changed ID values in "help.test". mysql-test/t/help.test: Now that (at least in 5.0) the system tables are filled with real data, inserting rows vith ID values 1 .. 5 will fail in release build tests (it did in 5.0.38) like it should already have done in customer installations. Shift the ID values up into a high area where they will not conflict, also make the distinct for the different kinds of values (= unique throughout the test). No change to the logic.
* | | | | Merge mysql.com:/home/ram/work/mysql-4.1-maintunknown2007-04-242-3/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b27515/b27515.4.1
| * \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41unknown2007-04-232-3/+100
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
| | * | | | Bug#27704: incorrect comparison of rows with NULL componentsunknown2007-04-202-3/+100
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for NULL components was incomplete for row comparison, fixed. Added support for abort_on_null at compare_row() like in 5.x sql/item_cmpfunc.h: Bug#27704: incorrect comparison of rows with NULL components Added support for abort_on_null at Item_bool_func2 like in 5.x sql/item_cmpfunc.cc: Bug#27704: incorrect comparison of rows with NULL components Support for NULL components was incomplete for row comparison, fixed. Added support for abort_on_null at compare_row() like in 5.x mysql-test/t/row.test: Test case updated for Bug#27704 (incorrect comparison of rows with NULL components) mysql-test/r/row.result: Test case updated for Bug#27704 (incorrect comparison of rows with NULL components) mysql-test/r/subselect.result: Test case updated for Bug#27704 (incorrect comparison of rows with NULL components)
* | | | | Merge mysql.com:/home/ram/work/mysql-4.1-maintunknown2007-04-241-0/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b27515/b27515.4.1
| * | | | Merge siva.hindu.god:/home/tsmith/m/bk/41unknown2007-04-171-0/+18
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/maint/41
| | * | | Fixed bug #27484: a crash when incompatible row expressions with nested rowsunknown2007-04-111-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are used as arguments of the IN predicate. Added a function to check compatibility of row expressions. Made sure that this function to be called for Item_func_in objects by fix_length_and_dec(). mysql-test/r/row.result: Added a test case for bug #27484. mysql-test/t/row.test: Added a test case for bug #27484.
* | | | | Fix for bug #27515: DROP previlege is not required anymore for RENAME TABLEunknown2007-04-171-0/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missed DROP privilege check on the original table for RENAME TABLE command. mysql-test/r/grant.result: Fix for bug #27515: DROP previlege is not required anymore for RENAME TABLE - test result. mysql-test/t/grant.test: Fix for bug #27515: DROP previlege is not required anymore for RENAME TABLE - test case. sql/sql_parse.cc: Fix for bug #27515: DROP previlege is not required anymore for RENAME TABLE - added DROP privilege check on the original table for RENAME TABLE command.
* | | | Update result(which mysterioulsy got lost)unknown2007-04-101-0/+15
| | | |
View Lorry Controller Status