Commit graph

28099 commits

Author SHA1 Message Date
unknown
98b81f0a6d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug15204


sql/opt_range.cc:
  Auto merged
2005-11-25 20:48:26 +03:00
unknown
08a4868bb6 BUG#15024: get_best_covering_ror_intersect() tries to build ROR-intersection
by starting with an empty index set and adding indexes to it until it
becomes covering. If the set becomes covering after adding the first index,
return NULL and don't try constructing ROR-intersection of one index (which
caused a crash)
2005-11-25 20:47:22 +03: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
72aa0f8de4 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168
into  devsrv-b.mysql.com:/space/magnus/mysql-5.0
2005-11-25 17:01:59 +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
unknown
e1af5e5dfd Updated expected error 2005-11-25 10:41:22 +01:00
unknown
e69de4f677 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b14146


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
2005-11-25 10:08:00 +04:00
unknown
1be7a7afa5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/13293-bug-5.0-mysql
2005-11-24 22:41:52 +03:00
unknown
dc8a5d54bd Remove t3 in join_nested.test
mysql-test/r/join_nested.result:
  Remove t3 too.
mysql-test/t/join_nested.test:
  Remove t3 too.
2005-11-24 19:51:52 +01:00
unknown
a545053841 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 19:45:36 +01:00
unknown
c91a2e9eb4 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 19:14:11 +01:00
unknown
0b262a6213 Some post-merge cleaning, and made assert THD::store_globals() work at all times.
mysql-test/t/sp.test:
  Tidying up after merge.
sql/mysqld.cc:
  Make sure we have thd->thread_stack set before calling store_globals().
  (And fixed compiler warning.)
sql/sql_class.cc:
  Init THD::tread_stack in constructor.
2005-11-24 19:13:13 +01:00
unknown
f8aae3e604 don't call handler::info() in SHOW CREATE TABLE 2005-11-24 18:13:08 +01:00
unknown
591fabb390 Fix bug#13293 Wrongly used index results in endless loop.
Loose index scan using only second part of multipart index was choosen, which
results in creating wrong keys and endless loop.

get_best_group_min_max() now allows loose index scan for distinct only if used
keyparts forms a prefix of the index.


mysql-test/t/group_min_max.test:
  Test case for bug #13293 Wrongly used index results in endless loop.
mysql-test/r/group_min_max.result:
  Test case for bug #13293 Wrongly used index results in endless loop.
sql/opt_range.cc:
  Fix bug #13293 Wrongly used index results in endless loop.
  get_best_group_min_max() now allows loose index scan for distinct only if used keyparts forms a prefix of the index.
2005-11-24 19:54:02 +03:00
unknown
ae2dc30930 Fix for bug #14693 (ALTER COLUMN SET DEFAULT has no effect)
mysql-test/r/alter_table.result:
  test result
mysql-test/t/alter_table.test:
  test case
sql/sql_table.cc:
  we should set the flag with the ALTER requirements
2005-11-24 20:24:45 +04:00
unknown
a101950d7b Bug #15168 yassl failure on amd64
- Use libtool to build libraries


config/ac-macros/yassl.m4:
  If necessary, disable inlining for all files in libtaocrypt not only integer.cpp
  Remove ver yassl_libs_with_path, not used anymore
extra/yassl/src/Makefile.am:
  Let libtool build libraries
extra/yassl/taocrypt/src/Makefile.am:
  Let libtool build libraries
  Only build one lib
libmysqld/Makefile.am:
  Dont include yassl libs in libmysqld
libmysqld/examples/Makefile.am:
  Add yassl includes and libs when linking examples with libmysqld
2005-11-24 17:17:36 +01:00
unknown
44662d2c69 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14482-bug-4.1-mysql
2005-11-24 19:17:31 +03:00
unknown
3190b21f95 Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
crash

resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.

resolve_const_item() now substitutes constants for items with 
result_type == ROW_RESULT only for Item_rows.


sql/item.cc:
  Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
  crash
  
  resolve_const_item() now applies optimization for items with
  result_type == ROW_RESULT only to Item_rows.
mysql-test/t/select.test:
  Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
mysql-test/r/select.result:
  Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
2005-11-24 19:16:51 +03:00
unknown
e6d90f51de Make it buildable with -ansi flag on some platforms.
extra/innochecksum.c:
  Define _XOPEN_SOURCE in order to include getopt.h when needed.
  
  The problem is that some platforms (for instance,
  SuSE 9.1/gcc-3.3.3) do not include getopt.h unless _XOPEN_SOURCE
  is defined, so optarg is undefined and the compiler complains.
2005-11-24 18:42:39 +03:00
unknown
54f9b2cc1b Polishing: get rid of C++-style comments.
mysys/my_open.c:
  Get rid of C++-style comments.
2005-11-24 18:27:14 +03:00
unknown
c3423d0d91 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2005-11-24 16:21:49 +01:00
unknown
102c0281fa Moved check of wrong schema version earlier 2005-11-24 16:21:07 +01:00
unknown
b323bb273e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 18:33:07 +04:00
unknown
d2ac9b5b67 table t7 was not dropped at the end
mysql-test/r/join_nested.result:
  drop t7
mysql-test/t/join_nested.test:
  drop t7
2005-11-24 16:11:59 +02:00
unknown
0719833683 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 14:14:00 +01:00
unknown
a2daaf8716 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 17:04:54 +04:00
unknown
2665fb75d6 small build fix for some compilers
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  build fix for some compilers
2005-11-25 00:04:53 +11:00
unknown
40e8361c65 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047
2005-11-24 16:59:37 +04:00
unknown
ccb7673681 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0


mysql-test/r/sp.result:
  Manual merge fix.
mysql-test/t/sp.test:
  Manual merge fix.
2005-11-24 12:12:49 +01:00
unknown
60f3487405 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug15215
2005-11-24 20:58:06 +11:00
unknown
222871ca58 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b15047


sql/sql_class.h:
  Auto merged
2005-11-24 13:42:47 +04:00
unknown
c2421d3f0d BUG#15215 mysqld fails at start-up because of illegal reply from mgmd
In the rare circumstance where a mysqld connects to a mgm server, then the
mgm server goes away before a node id can be allocated, it was possible to get
an Error in mgm protocol parser error message.


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  When allocating node id, retry connecting to a management server if it goes away.
ndb/src/mgmapi/mgmapi.cpp:
  Treat Eof and NoLine results from the parser as a sign that we should disconnect
  from this management server. It's up to the caller to work out if they want
  to try again.
2005-11-24 17:30:25 +11:00
unknown
eb92d6a1e3 Fix values printed by mysqldump for empty blob fields when
--hex-blob is used. (Bug #13318)


client/mysqldump.c:
  Don't use 0x... syntax for empty fields.
mysql-test/r/mysqldump.result:
  Add new results
mysql-test/t/mysqldump.test:
  Add new regression test
2005-11-23 17:31:44 -08:00
unknown
687b57be8d Fix handling of maximum value for MAX_ROWS on 64-bit platforms. (Bug #14155)
mysql-test/r/create.result:
  Add new results
mysql-test/t/create.test:
  Add regression test
sql/table.cc:
  To cap a value at 2^32-1 on a 64-bit platform, use UINT_MAX32, not
  ~(ulong)0, since a ulong may be 64-bit itself.
2005-11-23 17:05:59 -08:00
unknown
97bfd41fe1 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk


BitKeeper/etc/ignore:
  added libmysqld/ha_blackhole.cc
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Delete: libmysqld/ha_blackhole.cc
include/my_global.h:
  Don't use PATH_MAX for FN_REFLEN as this uses too much stack space.
  (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack)
mysql-test/r/federated.result:
  Update results after error message changes
mysql-test/r/grant.result:
  Update results after error message changes
mysql-test/r/grant2.result:
  Update results after error message changes
sql/ha_federated.cc:
  Fix error messages to be more consistent
sql/mysql_priv.h:
  Stack size to have when opening a table
  (This was needed on x86 64 bit Linux)
sql/share/errmsg.txt:
  Remove quotes around error string for federated as two quotes in the output looks strange
sql/sql_base.cc:
  More correct stack size
sql/sql_parse.cc:
  Set thread_stack before store_globals()
sql/unireg.h:
  More correct MAX_DBKEY_LENGTH
2005-11-24 02:36:28 +02:00
unknown
0f64a6222e Fix result of ROW_COUNT() after 'EXECUTE prepstmt'. (Bug #14956)
mysql-test/r/ps.result:
  Add new results
mysql-test/t/ps.test:
  Add new test
sql/sql_parse.cc:
  Don't reset row_count after processing EXECUTE statement.
2005-11-23 14:57:26 -08:00
unknown
f443161911 Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  regul.home.lan:/mnt/md/bk/mysql-5.0
2005-11-24 00:37:46 +02:00
unknown
1c313f0368 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root


sql/sql_class.cc:
  Auto merged
2005-11-23 21:20:31 +03:00
unknown
0633a41c15 Always initialize THD::thread_stack: it's used in
check_stack_overrun().


sql/slave.cc:
  Move initialization of THD::thread_stack before THD::store_globals()
sql/sql_acl.cc:
  Initialize THD::thread_stack in artificial THDs used
  to load gratns subsystem.
sql/sql_class.cc:
  Add an assert that THD::thread_stack is assigned.
sql/sql_insert.cc:
  Add initialization of THD::thread_stack (delayed insert
  thread).
sql/sql_parse.cc:
  Move initialization of THD::thread_stack before
  THD::store_globals().
sql/sql_udf.cc:
  Add initialization for THD::thread_stack (an artificial
  THD used to initialize UDF subsystem).
sql/tztime.cc:
  Add initialization for THD::thread_stack (an artificial
  THD used to initialize timezones).
2005-11-23 21:18:10 +03:00
unknown
147be17067 Fixes bug #14902. When analysing a table with FT index that contains stopwords
table statistics is not updated, so the next execution of analyze table will
try to update statistics again.


mysql-test/r/analyze.result:
  Updated result file for bug #14902 test.
mysql-test/t/analyze.test:
  Test for bug #14902.
2005-11-23 18:18:41 +03:00
unknown
aa4da5f742 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-23 13:02:50 +01:00
unknown
b118282377 Fixed BUG#13729 Stored procedures: packet error after exception handled
Don't set thd->is_fatal_error in sql_update for duplicate key errors.


mysql-test/r/sp.result:
  New test case for BUG#13729.
mysql-test/r/sp_trans.result:
  New test case for BUG#14840.
mysql-test/t/sp.test:
  New test case for BUG#13729.
mysql-test/t/sp_trans.test:
  New test case for BUG#14840.
sql/sql_update.cc:
  Don't set thd->is_fatal_error if it's a duplicate key error.
2005-11-23 11:56:53 +01:00
unknown
056d7266c7 A name of macro is fixed. 2005-11-23 12:26:07 +02:00
unknown
12826df81b merged 2005-11-23 09:52:18 +01:00
unknown
ddf89750ea Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-11-23 09:38:12 +01:00
unknown
4aea839bde postmerge fix 2005-11-23 02:49:44 +02:00