Commit graph

3818 commits

Author SHA1 Message Date
unknown
ccbc6f0573 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
2005-01-24 19:15:44 +01:00
unknown
0af8f70108 mysql_client_test.test, mysql-test-run.sh:
Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test-run.sh:
  Renamed client_test to mysql_client_test
  Support --embedded-server test on installed server
mysql_client_test.test:
  Renamed client_test to mysql_client_test
  Use env var CLIENT_TEST with full name, it differs when run with --embedded-server
  Rename: mysql-test/t/client_test.test -> mysql-test/t/mysql_client_test.test


mysql-test/mysql-test-run.sh:
  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test/t/mysql_client_test.test:
  Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
2005-01-24 16:56:17 +01:00
unknown
38e664cf64 fixed way of forward reference detection to support literal constant (BUG#8025)
mysql-test/r/subselect.result:
  Forward reference detection
mysql-test/t/subselect.test:
  Forward reference detection
sql/item.cc:
  now forward reference is detected via ref_pointer_array, because some literal constants are 'fixed' just after creation
sql/sql_base.cc:
  fill ref_pointer_array with zerows for forward reference detection.
2005-01-24 17:17:19 +02:00
unknown
ba3b78d968 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysys/mf_keycache.c:
  Auto merged
sql/item.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-01-24 15:50:13 +01:00
unknown
9182786918 check that row elements have the same dimention that SELECT list elements in comporison between rows and subqueries added (BUG#8022)
mysql-test/r/subselect.result:
  Comparison subquery and row with nested rows
mysql-test/t/subselect.test:
  Comparison subquery and row with nested rows
sql/item_subselect.cc:
  check that row elements have the same dimention that SELECT list elements
2005-01-24 15:56:57 +02:00
unknown
d514a06a86 fixed column number fetchinmg for subqueries. (BUG#8020)
fixed cols() method call (it have to be called only after fix_fields())


mysql-test/r/subselect.result:
  Comparison subquery with * and row
mysql-test/t/subselect.test:
  Comparison subquery with * and row
sql/item_cmpfunc.h:
  initialization allowed_arg_cols for autodetection
sql/item_func.cc:
  support of allowed_arg_cols autodetection by first argument
sql/item_func.h:
  commant
sql/item_subselect.cc:
  correct column number fetching for subqueries
sql/sql_lex.h:
  method to check that UNION is prepared
2005-01-24 14:25:44 +02:00
unknown
8827dbd4eb ndb_restore.result, mysql-test-run.sh:
added ndb_restore test
ndb_restore.result, ndb_restore.test:
  new file


mysql-test/mysql-test-run.sh:
  added ndb_restore test
mysql-test/r/ndb_restore.result:
  added ndb_restore test
2005-01-24 13:06:27 +01:00
unknown
84e7a86d4e Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100


sql/sql_select.cc:
  Auto merged
2005-01-24 10:47:52 +01:00
unknown
d7d7741e5b Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000


sql/sql_select.cc:
  Auto merged
2005-01-24 10:08:45 +01:00
unknown
1850f74925 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/sql_select.cc:
  Auto merged
2005-01-23 21:58:24 +02:00
unknown
d3db70de4c Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-22 02:42:54 -08:00
unknown
25c2d1adb0 select_found.result, select_found.test:
Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.


sql/sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
mysql-test/t/select_found.test:
  Added a test case for bug #7945.
mysql-test/r/select_found.result:
  Added a test case for bug #7945.
2005-01-22 02:40:27 -08:00
unknown
33f6fe7514 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-21 14:54:27 +02:00
unknown
aad7ab62f1 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-20 16:20:34 +01:00
unknown
4095dbb973 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-4000
2005-01-20 16:17:33 +01:00
unknown
b3cd49f312 fixed problem with distinct select with grouping and subqueries (BUG#7946)
mysql-test/r/derived.result:
  DISTINCT over grouped select on subquery in the FROM clause
mysql-test/t/derived.test:
  DISTINCT over grouped select on subquery in the FROM clause
sql/sql_select.cc:
  used current join copy for test
2005-01-20 13:56:22 +02:00
unknown
9241e34593 item_cmpfunc.cc:
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.


sql/item_cmpfunc.cc:
  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
2005-01-20 15:38:56 +04:00
unknown
699a530a0a BUG#6034 - Error code 124: Wrong medium type.
Version for 4.1. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test results.
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test case.
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type.
  With OPTION_BUFFER_RESULT in the 'select_options',
  defer the preparation of the insert table until the 
  result is to be used.
2005-01-19 21:16:27 +01:00
unknown
353bc07096 BUG#6034 - Error code 124: Wrong medium type.
Version for 4.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.


mysql-test/r/insert_select.result:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test results.
mysql-test/t/insert_select.test:
  BUG#6034 - Error code 124:  Wrong medium type.
  The test case.
sql/sql_select.cc:
  BUG#6034 - Error code 124:  Wrong medium type.
  With OPTION_BUFFER_RESULT in the 'select_options',
  defer the preparation of the insert table until the 
  result is to be used. Unfortunately, this happens
  at several places.
2005-01-19 21:13:30 +01:00
unknown
c8343423c2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
2005-01-19 23:02:28 +03:00
unknown
d2778647ae Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 13:34:22 -08:00
unknown
b697b6c0e0 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-01-18 23:29:47 +02:00
unknown
59ef5bede9 fixing wrong value for "examined rows" when UNION's are used.
mysql-test/r/union.result:
  result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
  test case for the wrong examined rows with UNION's
sql/sql_union.cc:
  a patch for the wrong examined rows with UNION's
2005-01-18 23:13:29 +02:00
unknown
8e5a74a6b6 Merge changed tests
sql/field_conv.cc:
  Auto merged
mysql-test/r/type_float.result:
  Merge
mysql-test/t/type_float.test:
  Merge
2005-01-18 12:25:56 -08:00
unknown
e2c869f2ff Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
prefix", which roots were fixed in 4.0 tree.


mysql-test/r/alter_table.result:
  Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
  prefix".
mysql-test/t/alter_table.test:
  Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
  prefix".
2005-01-18 17:45:49 +03:00
unknown
2e50981af9 Fix for BUG#7885
mysql-test/r/subselect.result:
  Testcase for BUG#7885
mysql-test/t/subselect.test:
  Testcase for BUG#7885
sql/item_subselect.cc:
  Fix for BUG#7885: In Item_subselect::fix_fields, return error if engine->prepare fails.
  Also removed redundant code line.
2005-01-18 17:26:05 +03:00
unknown
3671fe1f72 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-18 11:45:41 +01:00
unknown
f003895df9 myisam/ft_boolean_search.c
-trunc* bug - don't increase yweaks in this case


myisam/ft_boolean_search.c:
  -trunc* bug - don't increase yweaks in this case
mysql-test/r/fulltext.result:
  -trunc* bug - don't increase yweaks in this case
mysql-test/t/fulltext.test:
  -trunc* bug - don't increase yweaks in this case
2005-01-18 11:27:38 +01:00
unknown
ec0daa744f #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals
We should not overwrite res if it is returned from a const item.
2005-01-18 10:42:29 +04:00
unknown
dd68385435 Fix over-optimization that could result in an unsigned double field being
set to a negative value. (Bug #7700)


sql/field_conv.cc:
  Don't treat real fields as identical when destination is unsigned and
  the source is not.
mysql-test/t/type_float.test:
  Add test for setting double unsigned to a negative value from a signed double
mysql-test/r/type_float.result:
  Add test results
2005-01-17 16:13:56 -08:00
unknown
f1328f1337 Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into mysql.com:/home/timka/mysql/src/4.1-bug-7331


sql/sql_select.cc:
  Auto merged
2005-01-17 12:41:59 +02:00
unknown
e4b2a04e46 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-15 10:21:50 +01:00
unknown
16f3170e73 func_gconcat.result, func_gconcat.test:
Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.


sql/item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
mysql-test/t/func_gconcat.test:
  Added a test case for bug #7769.
mysql-test/r/func_gconcat.result:
  Added a test case for bug #7769.
2005-01-15 01:05:00 -08:00
unknown
3bb047c018 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-14 14:23:34 +01:00
unknown
5f533a3682 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean


sql/log_event.cc:
  Auto merged
2005-01-14 10:59:37 +01:00
unknown
3de3be6710 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug


sql/sql_yacc.yy:
  Auto merged
2005-01-14 10:09:01 +03:00
unknown
4799f07750 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-01-14 00:10:03 +02:00
unknown
c0af1e3c67 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2005-01-13 20:09:41 +02:00
unknown
fb8e271a2c Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235
into mysql.com:/home/jimw/my/mysql-4.1-clean


mysql-test/r/ctype_utf8.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
2005-01-13 09:24:07 -08:00
unknown
a28f221f35 Add test cases to verify that SHOW CREATE TABLE always outputs the
key algorithm for keys where they were explicitly specified.


mysql-test/r/show_check.result:
  Add results
mysql-test/t/show_check.test:
  Add tests for preservation of key algorithm in SHOW CREATE TABLE output
2005-01-13 18:22:35 +01:00
unknown
ebe1e8a9e6 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/field.cc:
  Auto merged
2005-01-13 09:07:21 -08:00
unknown
196d6f3466 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean


mysql-test/r/ctype_ucs.result:
  Auto merged
2005-01-13 15:35:36 +01:00
unknown
9842aca3ef bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
unknown
bcb3783c7c Fixed a problem with a test. Time could be 0 or 1 seconds, depending
on whether running with or without valgrind.
2005-01-13 15:04:57 +02:00
unknown
763d552689 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 14:46:41 +03:00
unknown
8b077c2b9f Fix conversion of floating point values to character fields when the
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)


sql/field.cc:
  Fix handling of negative values and fabs(values> < 1 in Field_str::store
mysql-test/r/type_float.result:
  Add results
mysql-test/r/type_float.result.es:
  Add results
mysql-test/t/type_float.test:
  Add test for conversion of floats to character field
2005-01-13 00:41:45 +01:00
unknown
611fd7522c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-12 22:23:00 +01:00
unknown
ec459b583b Minor clean up.
mysql-test/t/analyse.test:
  Added a note about the bug that this test case tests.
sql/sql_analyse.cc:
  Changed function description to standard format.
2005-01-12 22:55:10 +02:00
unknown
f5d30e0cac Fix for BUG#7793 "mysqlbinlog produces incorrect queries":
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)


mysql-test/r/ctype_ucs.result:
  backticks added
mysql-test/r/user_var.result:
  backticks added
mysql-test/t/user_var.test:
  testing a variable with BINARY collation, which needs the backticks
sql/log_event.cc:
  when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
2005-01-12 19:42:46 +01:00
unknown
d853e732b9 Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly".
mysql-test/r/func_sapdb.result:
  Added test for bug #7586 "TIMEDIFF for sec+microsec not working
  properly". Corrected previously wrong results of couple other
  statements.
mysql-test/t/func_sapdb.test:
  Added test for bug #7586 "TIMEDIFF for sec+microsec not working
  properly".
sql/item_timefunc.cc:
  Item_func_timediff::val_str():
   Use simplier and less error-prone implementation. Now we are counting 
   difference between time values in microseconds and convert it to time
   value (instead of using seconds and taking difference in "second_part"s 
   into account).
2005-01-12 12:18:36 +03:00