Commit graph

9184 commits

Author SHA1 Message Date
unknown
483e04b2d6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 14:29:12 +02:00
unknown
a050707b61 We should skip beggining '(' characters when test query on possibility
to be in the query cache. (BUG#14652)


mysql-test/r/query_cache.result:
  BUG#14652 test suite.
mysql-test/t/query_cache.test:
  BUG#14652 test suite.
sql/sql_cache.cc:
  We should skip beggining '(' characters when test query on possibility
  to be in the query cache.
2005-12-01 14:26:19 +02:00
unknown
babaa74e8a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
2005-12-01 14:31:28 +04:00
unknown
f853fbc9f4 Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
sql/sp_head.cc:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - call thd->cleanup_after_query() to clean next_insert_id.
sql/sql_class.cc:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - save/restore clear_next_insert_id
sql/sql_class.h:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - clear_next_insert_id added
2005-12-01 14:26:46 +04:00
unknown
c759cc6caf Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 12:16:45 +02:00
unknown
3e4d4a3656 View creation code fixed to expect empty TABLE_LIST::table pointer (BUG#15096).
mysql-test/r/view.result:
  BUG#15096 test suite.
mysql-test/t/view.test:
  BUG#15096 test suite.
sql/sql_view.cc:
  View placed in a function never get TABLE during view creation,
  because we have never executed that function in this process.
  So we should expect empty TABLE_LIST::table pointer.
2005-12-01 12:15:48 +02:00
unknown
85f0ef97e9 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 12:04:01 +02:00
unknown
2061a3a6b6 We should not skip temptable view along with other derived
tables during query tables registration. (BUG#15119)


mysql-test/r/view_query_cache.result:
  Tests for temptable views in the query cache.
mysql-test/t/view_query_cache.test:
  Tests for temptable views in the query cache.
sql/sql_cache.cc:
  We should not skip temptable view along with other derived
  tables during query tables registration.
2005-12-01 12:01:38 +02:00
unknown
c9ef409150 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into  mysql.com:/home/timka/mysql/src/5.0-bug-14920


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/group_min_max.result:
  Manually merged test cases.
mysql-test/t/group_min_max.test:
  Manually merged test cases.
2005-12-01 09:26:17 +02:00
unknown
ba079bad06 Fix for bug#14476 information_schema.TABLES.TABLE_TYPE with empty value
store TABLES.TABLE_TYPE in case of error during table opening


mysql-test/r/information_schema.result:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case
mysql-test/t/information_schema.test:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case
2005-12-01 11:00:33 +04:00
unknown
b775d23faa Fix union.result
mysql-test/r/union.result:
  Fix order of test results
2005-11-30 13:10:08 -08:00
unknown
03e057cd9e Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean


vio/viosslfactories.c:
  Auto merged
2005-11-30 10:18:11 -08:00
unknown
e26eb47b4b WL#2486 - natural/using join according to SQL:2003
Commented out one failing query in the regression test (reported as a bug).


mysql-test/r/join.result:
  Commented out failing query.
mysql-test/t/join.test:
  Commented out failing query.
2005-11-30 19:13:29 +02:00
unknown
7c38fc51d5 WL#2486 - natural/using join according to SQL:2003.
Implemented specialized regression test for the WL.


mysql-test/r/join.result:
  Test results for natural join tests.
mysql-test/t/join.test:
  Specialized test for natural join, and join ... on.
2005-11-30 19:06:58 +02:00
unknown
e3f5755228 Fix for BUG#14920 Ordering aggregated result sets corrupts resultset.
The cause of the bug was the use of end_write_group instead of end_write
in the case when ORDER BY required a temporary table, which didn't take
into account the fact that loose index scan already computes the result
of MIN/MAX aggregate functions (and performs grouping).

The solution is to call end_write instead of end_write_group and to add
the MIN/MAX functions to the list of regular functions so that their
values are inserted into the temporary table.


mysql-test/r/group_min_max.result:
  Test for BUG#14920
mysql-test/t/group_min_max.test:
  Test for BUG#14920
sql/sql_class.cc:
  Added new member to TMP_TABLE_PARAM.
sql/sql_class.h:
  Added new member to TMP_TABLE_PARAM.
sql/sql_select.cc:
  Enable result rows generated by loose index scan being written into
  a temporary table. The change is necessary because loose index
  scan already computes the result of GROUP BY and the MIN/MAX aggregate
  functions. This is realized by three changes:
  - create_tmp_table allocates space for aggregate functions in the
    list of regular functions,
  - use end_write instead of end_write group,
  - copy the pointers to the MIN/MAX aggregate functions to the list
    of regular functions TMP_TABLE_PARAM::items_to_copy.
sql/sql_select.h:
  New parameter to create_tmp_table.
2005-11-30 12:52:12 +02:00
unknown
d9d1337e2e Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/union.result:
  Auto merged
sql/item.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/t/union.test:
  Resolve conflict
2005-11-29 15:33:58 -08:00
unknown
a171aa693e Merge mysql.com:/home/jimw/my/mysql-4.1-14216
into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item.cc:
  Auto merged
2005-11-29 11:52:58 -08:00
unknown
b37a5f0f12 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/mysql-5.0
2005-11-29 14:08:49 +01:00
unknown
2985bc7a4d test fixed
mysql-test/r/type_ranges.result:
  result fixed
2005-11-29 16:46:51 +04:00
unknown
c6f9e7bf6e Moved long running query to type_newdecimal-big.test
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]


mysql-test/r/type_newdecimal.result:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
  [Backported from mysql-5.1-new]
mysql-test/t/type_newdecimal.test:
  Moved long running query to type_newdecimal-big.test
  Removed warnings that depends on floating point comparisions
  [Backported from mysql-5.1-new]
2005-11-29 13:42:45 +01:00
unknown
88822b356a Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.14693


sql/sql_table.cc:
  Auto merged
2005-11-29 13:33:56 +04:00
unknown
5b6a28d12d Merge mysql.com:/usr/home/bar/mysql-4.1.b10446
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ctype_recoding.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
2005-11-29 09:25:51 +04:00
unknown
0fa8fc66df Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b10446


sql/item.cc:
  Auto merged
2005-11-29 09:21:57 +04:00
unknown
4b50aca58a Merge mysql.com:/home/jimw/my/mysql-5.0-14956
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/t/ps.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
2005-11-28 10:51:54 -08:00
unknown
6c41013ea3 Merge mysql.com:/home/jimw/my/mysql-4.1-14155
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  Resolve conflict
2005-11-28 10:50:23 -08:00
unknown
e7bfd24264 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-11-28 17:26:56 +01:00
unknown
b9d493d04c Merge mysql.com:/M50/testbugs-5.0 into mysql.com:/M50/mysql-5.0 2005-11-28 17:17:17 +01:00
unknown
7d9861ecd4 mysql-test/t/alter_table.test
Care for case-insignificant platforms (Mac OS X, Windows).


mysql-test/t/alter_table.test:
  Care for case-insignificant platforms (Mac OS X, Windows).
2005-11-28 17:07:54 +01:00
unknown
0e2335a264 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
2005-11-28 15:11:26 +01:00
unknown
8f6c1a5687 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
2005-11-28 17:16:39 +04:00
unknown
12de238b09 grant.result:
After merge fix.


mysql-test/r/grant.result:
  After merge fix.
2005-11-28 17:06:57 +04:00
unknown
50d615f31f Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0


sql/sp_head.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
mysql-test/t/sp.test:
  Manual merge.
2005-11-28 13:20:15 +01:00
unknown
5edc1d5d97 Merge mysql.com:/usr/home/bar/mysql-4.1.b14406
into  mysql.com:/usr/home/bar/mysql-5.0


mysql-test/r/ps_grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
2005-11-28 15:31:11 +04:00
unknown
6cc4218f21 Fix for bug #12956: cast make differ rounding.
sql/item_func.cc:
  Fix for bug #12956: cast make differ rounding.
  - call rint() as we do in the Field_*int*::store(double)
2005-11-28 14:52:38 +04:00
unknown
b1961ce5d0 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
2005-11-28 12:45:40 +04:00
unknown
dc3e736bff Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-11-28 09:44:47 +01:00
unknown
84da27f67a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-27 09:39:45 +01:00
unknown
b75e21fa97 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2005-11-26 13:54:21 -08:00
unknown
d3b057aa63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-26 20:56:05 +01:00
unknown
b1dc9db137 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-11-26 20:50:22 +01:00
unknown
76c4dda1cf Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


myisam/ft_parser.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
2005-11-26 20:23:20 +01:00
unknown
8778a5df5a followup for for the bug#5686 2005-11-26 19:36:11 +01:00
unknown
06887bc330 Enabled back bunch of tests for stored routines which were disabled
earlier because of various features/checks missing (these features/checks
are now implemented).


mysql-test/r/sp.result:
  Enabled back bunch of tests which were previously disabled because of various
  features/checks missing (since these features/checks are now implemented).
mysql-test/t/sp.test:
  Enabled back bunch of tests which were previously disabled because of various
  features/checks missing (since these features/checks are now implemented).
2005-11-26 19:15:17 +03:00
unknown
fd4fcd2f7f Fixed bug #15106.
A typo bug caused loss of a predicate of the form field=const in some cases.


mysql-test/r/select.result:
  Added a test case for bug #15106.
mysql-test/t/select.test:
  Added a test case for bug #15106.
2005-11-25 18:51:44 -08:00
unknown
e0367223d1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 19:27:20 +03:00
unknown
d4088df5e9 Fixed BUG#14233: Crash after tampering with the mysql.proc table
Post-review version. Some minor review fixes, but also changed the way
  some errors are handled: Don't return specific parse errors; instead
  always use the more general "table corrupt" error (amended accordingly).


mysql-test/r/sp-destruct.result:
  Updated results.
mysql-test/r/sp-error.result:
  Updated for fully qualified name in "no return" error message.
mysql-test/t/sp-destruct.test:
  Adopted the more consistent error handling for a corrupted mysql.proc table.
  (No more "parse error" et al).
sql/share/errmsg.txt:
  Changed ER_SP_PROC_TABLE_CORRUPT to be more explicit.
sql/sp.cc:
  Review fixes.
  Changed the handling of parse errors, and added the routine name to the "table corrupt" error message.
sql/sql_base.cc:
  Review changes: Change error tests and added comments.
sql/sql_parse.cc:
  Mored ER_SP_NORETURN test of functions to sql_yacc.yy for more general error handling.
sql/sql_yacc.yy:
  Mored ER_SP_NORETURN test of functions from sql_parse.cc for more general error handling.
2005-11-25 17:09:26 +01:00
unknown
2e79201c72 Post-merge fixes. 2005-11-25 18:53:55 +03:00
unknown
61e454c0a9 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/table.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
include/my_base.h:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/r/select.result:
  Manual merge.
mysql-test/t/ndb_alter_table.test:
  Manual merge.
mysql-test/t/ndb_basic.test:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.
sql-common/client.c:
  k	
sql/ha_ndbcluster.cc:
  Manual merge.
sql/item.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
2005-11-25 13:57:13 +03:00
unknown
2a1ae3a5e3 A fix and a test case for Bug#14410 "Crash in Enum or Set type in
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.


mysql-test/r/ps.result:
  Test results has been fixed (Bug#14410)
mysql-test/t/ps.test:
  A test case for Bug#14410 "Crash in Enum or Set type in CREATE 
  TABLE and PS/SP"
sql/mysql_priv.h:
  typelib() function declaration has been changed.
sql/sql_table.cc:
  Supply the statement memory root to use in typelib() and
  safe_charset_converter() functions to ensure that objects 
  created during the first execution of CREATE TABLE statement
  are allocated in persistent memory of the statement.
sql/table.cc:
  Change typelib() function to require MEM_ROOT.
2005-11-25 13:25:31 +03:00
unknown
6fb8a4e915 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-25 10:56:01 +01:00