Commit graph

23807 commits

Author SHA1 Message Date
unknown
8771b9f4eb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-06-16 13:30:14 +05:00
unknown
5574de167c Fix for bug#9434 SHOW CREATE DATABASE information_schema;
added ability to do SHOW CREATE DATABASE `information_schema`
2005-06-16 13:27:22 +05:00
unknown
82297c1c90 BUG#11132 Connections stuck in CLOSE_WAIT
This fixes the problem in 5.0 in the correct way.

The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
for 4.1.


ndb/src/kernel/main.cpp:
  The ndbd angel process keeps the mgm connection open as it retains a reference
  to the socket.
  
  this means that when the mgm server is killed, the socket stays in CLOSE_WAIT 
  (the ndb process will close() it okay in 5.0, as we reused it for a transporter
  but this isn't enough as the angel process still has a reference to that socket).
  
  so, by adding in a theConfig->closeConfiguration(); in the angel process, the ndb
  process is left with the only reference to the socket - which it can close whenever
  it likes (namely when the connection is terminated).
2005-06-16 18:17:44 +10:00
unknown
2074572171 fix test results - Bug #11328
mysql-test/r/bdb_cache.result:
  fix test results
mysql-test/t/bdb_cache.test:
  fix test results
2005-06-16 10:09:05 +02:00
unknown
3568bba8b6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-06-16 12:45:22 +05:00
unknown
20eaad0e6e a fix (bug #10650: Bit literal case sensitivity).
mysys/charset.c:
  a fix (bug #10650: Bit literal case sensitivity).
  typo fixed.
2005-06-16 12:17:15 +05:00
unknown
8dd1be2d97 Fix for bug#11055: information_schema: routines.sql_data_access has wrong value 2005-06-16 12:12:47 +05:00
unknown
d27132953d fix debug string in TR::report_disconnect
ndb/src/common/transporter/TransporterRegistry.cpp:
  fix debug string for TR::report_disconnect
2005-06-16 14:21:48 +10:00
unknown
7748d388a1 BUG#11132 Connections stuck in CLOSE_WAIT
The 4.1 fix is not valid for 5.0. Remove it.


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  This fix is not valid for 5.0 as we use the mgm server connection for more than
  just fetching the initial configuration
2005-06-16 12:52:07 +10:00
unknown
37b02e7ce8 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
2005-06-16 12:47:04 +10:00
unknown
9fb9133f2c cleanup for bug#11167.
portability alignment issues.
2005-06-15 22:49:52 +02:00
unknown
f1f1d39a29 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-06-15 20:24:13 +02:00
unknown
f1e42a0b35 renamed:
Item_buff -> Cached_item
  Item_arena -> Query_arena
  TEST_ASSERT -> YYERROR_UNLESS


sql/item.h:
  renamed:
    Item_buff -> Cached_item
sql/item_buff.cc:
  renamed:
    Item_buff -> Cached_item
sql/item_func.cc:
  renamed:
    Item_arena -> Query_arena
sql/item_subselect.cc:
  renamed:
    Item_arena -> Query_arena
sql/sp_head.cc:
  renamed:
    Item_arena -> Query_arena
sql/sp_head.h:
  renamed:
    Item_arena -> Query_arena
sql/sql_base.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_class.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_class.h:
  renamed:
    Item_arena -> Query_arena
sql/sql_lex.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_prepare.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_select.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_select.h:
  renamed:
    Item_buff -> Cached_item
    Item_arena -> Query_arena
sql/sql_union.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_view.cc:
  renamed:
    Item_arena -> Query_arena
sql/sql_yacc.yy:
  renamed:
    TEST_ASSERT -> YYERROR_UNLESS
sql/table.cc:
  renamed:
    Item_arena -> Query_arena
2005-06-15 19:58:35 +02:00
unknown
fc465d1497 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-15 22:43:44 +05:00
unknown
a5b6a39f9a Improvement of the auxiliary routines include/show_msg*.inc
- replace @message by $message
  --> The annoying protocol line "SET @message= <value>" will disappear.
- extended description
- some examples added


mysql-test/include/show_msg.inc:
  replace @message by $message
mysql-test/include/show_msg80.inc:
  - replace @message by $message
  - extended description
  - some examples added
mysql-test/r/mysqltest.result:
  updated results
mysql-test/t/mysqltest.test:
  sub testcases for the show_msg*.inc scripts modified, because the script properties are altered
2005-06-15 19:16:17 +02:00
unknown
8419d7472f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-15 21:55:11 +05:00
unknown
24de70926e Manual merge
sql/field.cc:
  Auto merged
2005-06-15 08:39:00 -07:00
unknown
1575df0074 cast.result, cast.test:
Added test case for bug #11283.
field.h, field.cc:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.


sql/field.cc:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.
sql/field.h:
  Fixed bug #11283: wrong conversion from varchar to decimal.
  Added methods Field_string::val_decimal,
  Field_varstring::val_decimal, Field_blob::val_decimal.
  They are not inherited from the base class Field_longstr
  anymore.
mysql-test/t/cast.test:
  Added test case for bug #11283.
mysql-test/r/cast.result:
  Added test case for bug #11283.
2005-06-15 08:27:33 -07:00
unknown
2ec50db87c Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.10632


strings/decimal.c:
  Auto merged
2005-06-15 19:56:01 +05:00
unknown
df60c7ef2d Fix for bug #10632 (CEILING returns wrong result)
mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
strings/decimal.c:
  handling of round_digit changed - we have to check all the digits after
  the point if round_digit is 0
2005-06-15 19:53:40 +05:00
unknown
04ec8eca81 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.10337


strings/decimal.c:
  Auto merged
2005-06-15 19:07:11 +05:00
unknown
e4cdb19387 Fix for bug #10337 (cast(NULL DECIMAL) crashes the server)
mysql-test/r/cast.result:
  test result fixed
mysql-test/t/cast.test:
  test case added
sql/item_func.cc:
  checks for NULL added
strings/decimal.c:
  we need to return specified 'scale' for the rounded decimal
2005-06-15 19:02:35 +05:00
unknown
7fdcb69b81 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2005-06-15 15:58:56 +02:00
unknown
6393d0239d Added comment after Serg's review 2005-06-15 15:57:38 +02:00
unknown
e7a26a1313 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 15:19:33 +02:00
unknown
85d688a47a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-06-15 15:17:58 +02:00
unknown
c813e97cfa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 15:02:48 +02:00
unknown
ad57284c69 join_nested.result, join_nested.test:
Added a teast case for bug #11284.
sql_select.cc:
  Fixed bug #11284.
  Optimization with empty inner table currently cannot be
  used in the case of nested outer join.


sql/sql_select.cc:
  Fixed bug #11284.
  Optimization with empty inner table currently cannot be
  used in the case of nested outer join.
mysql-test/t/join_nested.test:
  Added a teast case for bug #11284.
2005-06-15 05:56:19 -07:00
unknown
d925e516b3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 13:32:41 +02:00
unknown
67c204c46b Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/sql_select.cc:
  Auto merged
2005-06-15 03:39:43 -07:00
unknown
b0df449452 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-06-15 12:39:42 +02:00
unknown
c658b990b8 Bug #11221 Mysqld does not automatically reconnecting to cluster with cluster restart 2005-06-15 12:29:55 +02:00
unknown
098d02eb44 join_outer.result, join_outer.test:
Added a test case for bug #11285.
sql_select.cc:
  Fixed bug #11285.
  The problem occurred with Item_equal in an 'on expression'
  that was evaluated to false.


sql/sql_select.cc:
  Fixed bug #11285.
  The problem occurred with Item_equal in an 'on expression'
  that was evaluated to false.
mysql-test/t/join_outer.test:
  Added a test case for bug #11285.
mysql-test/r/join_outer.result:
  Added a test case for bug #11285.
2005-06-15 02:02:25 -07:00
unknown
fd39c731b0 Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-06-15 10:49:35 +03:00
unknown
749a4e9166 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-15 09:28:35 +02:00
unknown
fcf1aab756 Fix for bug #11174 (can't determine hostname under Windows 64-bit) 2005-06-15 09:27:24 +02:00
unknown
b0502fc200 Fixes some of the failing test cases for Netware. 2005-06-15 10:25:03 +03:00
unknown
476ca52ee7 Fix for BUG#11211 "GROUP BY doesn't work correctly"
When the GROUP BY clause contains a column reference that can be resolved to
both an aliased column in the SELECT list, and to a column in the FROM clause,
the group column is resolved to the column in the FROM clause (for ANSI conformance).
However, it may be so that the user's intent is just the other way around, and he/she
gets the query results grouped by a completely different column than expexted.
This patch adds a warning in such cases that tells the user that there is potential
ambiguity in the group column.

sql/sql_select.cc
- Added a warning when a GROUP column is ambiguous due to that there is a
  column reference with the same name both in the SELECT and FROM clauses.
  In this case we resolve to the column in FROM clause and warn the user
  of a possible ambiguity.
- More extensive comments.
- Changed the function to return bool instead of int (as in other places).

mysql-test/t/group_by.test
  Added test for BUG#11211.

mysql-test/r/group_by.result
  Added test for BUG#11211.


mysql-test/r/group_by.result:
  Import patch 11211.diff
mysql-test/t/group_by.test:
  Import patch 11211.diff
sql/sql_select.cc:
  Import patch 11211.diff
BitKeeper/etc/ignore:
  Added ndb/src/dummy.cpp to the ignore list
mysql-test/r/alias.result:
  Added warning for potentially ambiguous column.
mysql-test/r/having.result:
  Added warning for potentially ambiguous column.
2005-06-15 10:12:49 +03:00
unknown
b78072633d BUG#11132 Connections stuck in CLOSE_WAIT
In 4.1 (it is different in 5.0), we do not use the mgm connection after fetching the
configuration (and if we did, we would have to have calls to check the connection and
reconnect if needed - in case the mgm server had restarted) so we can disconnect after
first use.

This means we won't have connections stuck in CLOSE_WAIT when the mgm server shuts down.


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Disconnect from management server after configuration is fetched.
2005-06-15 14:58:53 +10:00
unknown
894fd6ae07 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-06-15 03:05:41 +04:00
unknown
4d8cbb0c27 fix of BUG#11111 fix
sql/item.h:
  revrited as recursive
sql/sql_select.cc:
  real_type is virtual
tests/mysql_client_test.c:
  check results abd delete views
2005-06-15 01:57:25 +03:00
unknown
0b5700c086 gcc 2.96 fixes (workarounds for compiler bugs in namespace handling)
extra/yassl/include/yassl_int.hpp:
  gcc 2.96 fixes
extra/yassl/include/yassl_types.hpp:
  gcc 2.96 fixes
2005-06-15 02:57:23 +04:00
unknown
228ec06370 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-5.0-build


support-files/mysql.spec.sh:
  Auto merged
2005-06-15 00:57:23 +02:00
unknown
10061029bc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
2005-06-15 01:57:23 +03:00
unknown
970e20b7fe Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  moonbone.local:/work/mysql-5.0-bug-11111
2005-06-15 02:57:22 +04:00
unknown
4095a52a77 Fix 11 "fetch from view returns wrong data"
Wrong method for creating temporary field was choosen, which results in
sending int field with int header but lonlong data.

Test case is added to mysql_client_test.c because client library is required
to test the bug.



tests/mysql_client_test.c:
  Test case for bug#11111 "fetch from view returns wrong data"
sql/sql_select.cc:
  Fix bug #11111 "fetch from view returns wrong data"
sql/item.h:
  Fix bug #11111 "fetch from view returns wrong data"
2005-06-15 01:57:40 +04:00
unknown
7f5d221393 rename: store_to_string -> store_to_protocol_packet 2005-06-15 01:06:25 +04:00
unknown
70b58ecb91 WL#2286 - Compile MySQL w/YASSL support
Fix for link failures on boxes with non-gnu compiler.
    Fix for compilation failure on hpux11.


extra/yassl/taocrypt/src/misc.cpp:
  Adjust __HP_aCC value to solve compilation problem on hpux11.
tools/Makefile.am:
  Add a dummy C++ file to mysqltestmanager to make libtool use a C++ linker:
  this lets mysqltestmanager link when using yaSSL and a non-gcc C++ compiler.
2005-06-15 01:39:58 +05:00
unknown
e1c2646a0c prohibit opening Query cache for SP cursors (BUG#9715)
mysql-test/r/query_cache.result:
  testing cursors in SP with QC
  testing suspicious but working using selects in function with QC
mysql-test/t/query_cache.test:
  testing cursors in SP with QC
  testing suspicious but working using selects in function with QC
sql/sp_head.h:
  method for prohibiting of QC using SP query
sql/sp_rcontext.cc:
  prohibit opening Query cache for SP cursors
sql/sp_rcontext.h:
  constructor moved to .cc file to be able to use methods from lex_keeper
2005-06-14 22:45:48 +03:00
unknown
d92877629c - Do not build the RPMs statically on i386 by default, only when adding either
"--with static" or "--define '_with_static 1'" to the RPM build options. 
   Static linking really only makes sense when linking against the specially patched
   glibc 2.2.5.


support-files/mysql.spec.sh:
   - Do not build statically on i386 by default, only when adding either "--with
     static" or "--define '_with_static 1'" to the RPM build options. Static
     linking really only makes sense when linking against the specially patched
     glibc 2.2.5.
2005-06-14 21:39:08 +02:00