Commit graph

29943 commits

Author SHA1 Message Date
unknown
f9523779ea Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime


sql/sql_yacc.yy:
  Auto merged
2006-04-20 16:00:33 +02:00
unknown
0eb3afaf6f Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-20 15:25:28 +02:00
unknown
c01754c9f3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-04-20 13:35:34 +02:00
unknown
58938d21ca Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-20 12:35:10 +02:00
unknown
316c96fa81 Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code 2006-04-20 12:06:22 +02:00
unknown
d27c7a7c80 func_gconcat.result, func_gconcat.test:
Remove duplicate test case for bug#14169


mysql-test/t/func_gconcat.test:
  Remove duplicate test case for bug#14169
mysql-test/r/func_gconcat.result:
  Remove duplicate test case for bug#14169
2006-04-20 13:34:14 +04:00
unknown
5f3c91080c Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  production.mysql.com:/usersnfs/mleich/src
2006-04-20 11:31:22 +02:00
unknown
fffe7c4d1e func_gconcat.test:
Clean up test case for bug#14169


mysql-test/t/func_gconcat.test:
  Clean up test case for bug#14169
2006-04-20 12:35:33 +04:00
unknown
a9c295f3c9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2006-04-20 10:13:04 +02:00
unknown
b30d80e826 Post merge fix 2006-04-20 00:42:12 -07:00
unknown
0775a71222 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-19 18:27:18 -07:00
unknown
8e27c3744f Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysys/mf_keycache.c:
  Auto merged
ndb/src/kernel/SimBlockList.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
mysql-test/r/func_gconcat.result:
  Manual merge
mysql-test/r/key_cache.result:
  Manual merge
mysql-test/t/func_gconcat.test:
  Manual merge
mysql-test/t/key_cache.test:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/item_sum.h:
  Manual merge
sql/lock.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
sql/unireg.h:
  Manual merge
2006-04-19 18:08:15 -07:00
unknown
e4d653abb8 Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol.
mysql-test/r/func_gconcat.result:
  Added DROP TABLE command to the test case for bug 14169.
2006-04-19 16:08:37 -07:00
unknown
67aca614ba Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
fixlet corrects return to DBUG_RETURN to restore the balance.


sql/sql_base.cc:
  DBUG_ENTER without DBUG_RETURN in open_table()
2006-04-20 01:02:33 +02:00
unknown
c5faf3689b debugging a BK issue 2006-04-20 00:55:30 +02:00
unknown
34efb701ed Merge rurik.mysql.com:/home/igor/mysql-4.1
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-2
2006-04-19 14:42:51 -07:00
unknown
d8df724af2 Merge mysql.com:/home/jimw/my/mysql-5.0-17043
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-19 14:18:35 -07:00
unknown
073e16999e Bug#18964 "return 0 instead of DBUG_RETURN(0) in sql_base.cc::open_table()"
fixlet corrects return to DBUG_RETURN to restore the balance.


sql/sql_base.cc:
  DBUG_ENTER without DBUG_RETURN in open_table()
2006-04-19 22:56:48 +02:00
unknown
08e5267969 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/14169-bug-4.1-mysql
2006-04-20 00:28:17 +04:00
unknown
913c8fa185 func_gconcat.result:
Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.


mysql-test/r/func_gconcat.result:
  Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
2006-04-20 00:27:43 +04:00
unknown
c0887e5461 Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
After a locking error the open table(s) were not fully
cleaned up for reuse. But they were put into the open table
cache even before the lock was tried. The next statement
reused the table(s) with a wrong lock type set up. This
tricked MyISAM into believing that it don't need to update
the table statistics. Hence CHECK TABLE reported a mismatch
of record count and table size.

Fortunately nothing worse has been detected yet. The effect
of the test case was that the insert worked on a read locked
table. (!)

I added a new function that clears the lock type from all
tables that were prepared for a lock. I call this function
when a lock failes.

No test case. One test would add 50 seconds to the
test suite. Another test requires file mode modifications.
I added a test script to the bug report. It contains three
cases for failing locks. All could reproduce a table
corruption. All are fixed by this patch.

This bug was not lock timeout specific.


sql/lock.cc:
  Bug#18544 - LOCK TABLES timeout causes MyISAM table corruption
  Resetting the lock type in the open table(s) lock data
  after a locking error.
2006-04-19 22:54:25 +05:00
unknown
c7cd7951cf Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mysql.com:/home/dlenev/mysql-5.0-bg16021


sql/item_func.cc:
  Auto merged
2006-04-19 19:35:32 +04:00
unknown
de76dd3a1f Added test case for bug #16021 "Wrong index given to function in trigger"
which was caused by the same bulk insert optimization as bug #17764 but
had slightly different symptoms.
2006-04-19 19:13:03 +04:00
unknown
f2ad5332f3 Bug#19190 syntax error in mysql-test/mysql-test-run.sh script
mysql-test/mysql-test-run.sh:
  Use 'test', not '[' as the shell builtin might not have '-L
2006-04-19 16:23:35 +02:00
unknown
42624eda4f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


configure.in:
  Auto merged
2006-04-19 15:41:56 +02:00
unknown
527d180571 Merge 192.168.0.20:mysql/my50-yassl_3/
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-19 14:15:17 +02:00
unknown
f5b0b1c3a8 Merge neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-19 13:56:09 +02:00
unknown
8bc1fa97dc Add the .der files used by yaSSL benchmark
extra/yassl/taocrypt/benchmark/dh1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/dh1024.der''
extra/yassl/taocrypt/benchmark/dsa1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/dsa1024.der''
extra/yassl/taocrypt/benchmark/rsa1024.der:
  New BitKeeper file ``extra/yassl/taocrypt/benchmark/rsa1024.der''
2006-04-19 11:42:55 +02:00
unknown
feb2815b32 Add .der files, used by yaSSL benchmark
Add benchamrk to dirs to build


extra/yassl/taocrypt/Makefile.am:
  Add benchmark to dirs to build
2006-04-19 11:33:49 +02:00
unknown
707074a558 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-19 10:43:58 +02:00
unknown
8b37d8f6bf Import from upstream yaSSL
extra/yassl/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
2006-04-19 10:21:00 +02:00
unknown
fb62bcb002 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2006-04-19 17:14:35 +10:00
unknown
b97e48a95b Fixed bug #19079.
The bug caused a reported index corruption in the cases when
key_cache_block_size was not a multiple of myisam_block_size,
e.g. when key_cache_block_size=1536 while myisam_block_size=1024.


mysql-test/r/key_cache.result:
  Added a test case for bug #19079.
mysql-test/t/key_cache.test:
  Added a test case for bug #19079.
2006-04-18 20:57:31 -07:00
unknown
f909f9965b Cleanup test cases that leaves "stuff" behind
mysql-test/r/ctype_latin2_ch.result:
  Drot table at end of test
mysql-test/r/grant2.result:
  Drop users
mysql-test/r/openssl_1.result:
  Drop users
mysql-test/r/rpl_openssl.result:
  Drop users
mysql-test/r/sp-security.result:
  Drop users
mysql-test/r/sp_notembedded.result:
  Drop table
mysql-test/r/trigger.result:
  Drop table
mysql-test/t/ctype_latin2_ch.test:
  Drop table
mysql-test/t/grant2.test:
  Drop users
mysql-test/t/openssl_1.test:
  Drop users
mysql-test/t/rpl_openssl.test:
  Drop users
mysql-test/t/sp-security.test:
  Drop users
mysql-test/t/sp_notembedded.test:
  Drop table
mysql-test/t/trigger.test:
  Drop table
2006-04-18 18:10:47 +02:00
unknown
f539e5880b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2006-04-18 17:07:35 +02:00
unknown
176cd14352 Fixed BUG#18344: DROP DATABASE does not drop associated routines
We must use the db key length in sp_drop_db_routines (and not the
  number of characters), or long db names will be truncated in the key.


mysql-test/r/sp.result:
  Updated results for new test case (BUG#18344)
mysql-test/t/sp.test:
  Added new test case for BUG#18344.
sql/sp.cc:
  In sp_drop_db_routines(), give the key field's ("db") key length
  instead of the number of characters to index_read(), or the key
  packing will truncate long db names.
2006-04-18 16:01:01 +02:00
unknown
eb196d0604 Import from yaSSL upstream
extra/yassl/include/openssl/rsa.h:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/yassl_int.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl_types.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/helpers.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/list.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/vector.hpp:
  Import patch yassl.diff
extra/yassl/src/handshake.cpp:
  Import patch yassl.diff
extra/yassl/src/socket_wrapper.cpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_imp.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/benchmark.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/integer.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/misc.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/runtime.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/types.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/algebra.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/random.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/template_instnt.cpp:
  Import patch yassl.diff
2006-04-18 14:41:43 +02:00
unknown
535eeb5b48 ndb -
post merge


ndb/src/ndbapi/TransporterFacade.hpp:
  merge fix
2006-04-18 14:36:29 +02:00
unknown
ad2d268d24 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
2006-04-18 14:34:40 +02:00
unknown
e0218948e5 ndb -
fix api_signal_log print of uncond signals


ndb/src/ndbapi/Ndbif.cpp:
  Send TC_COMMIT_ACK uncond
ndb/src/ndbapi/TransporterFacade.cpp:
  Fix printout of uncond signals
ndb/src/ndbapi/TransporterFacade.hpp:
  Fix printout of uncond signals
2006-04-18 14:34:11 +02:00
unknown
eb9c676fa2 Merge mysql.com:/home/matthias/Arbeit/mysql-4.1/src
into  mysql.com:/home/matthias/Arbeit/mysql-4.1/src-1
2006-04-18 14:18:51 +02:00
unknown
78342cd64b Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
into  mysql.com:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-18 13:43:52 +02:00
unknown
d1200b4a64 configure.in:
Stepped up version to 5.0.20a


configure.in:
  Stepped up version to 5.0.20a
2006-04-18 13:26:41 +02:00
unknown
c13cc758d5 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
2006-04-18 13:08:16 +02:00
unknown
5db9db07a5 Bug#18815 libmysql using yassl can't be linked with c program
- Apply patch to remove dependency on C++ libs when linking "libmysql" from c


extra/yassl/include/openssl/rsa.h:
  Fix spelling error
extra/yassl/include/openssl/ssl.h:
  Fix spelling error
extra/yassl/include/yassl_int.hpp:
  Remove static instance
extra/yassl/include/yassl_types.hpp:
  Add CleanUp function for static singletons
extra/yassl/src/handshake.cpp:
  Use buffered.reset(0) instead of null_buffer
extra/yassl/src/template_instnt.cpp:
  Add instantiation of two new templates
extra/yassl/src/yassl_int.cpp:
  Use static pointers for singletons
extra/yassl/taocrypt/include/integer.hpp:
  Remove statoc singletons from class scope
extra/yassl/taocrypt/include/misc.hpp:
  Add clenaup function
extra/yassl/taocrypt/include/runtime.hpp:
  Add runtime for Solaris
extra/yassl/taocrypt/src/algebra.cpp:
  Use mySTL::vector to avoid array of Element being on the stack
extra/yassl/taocrypt/src/integer.cpp:
  Use static pointers for singletons
  Add cleanup function
extra/yassl/taocrypt/src/template_instnt.cpp:
  Add instantiation of one new template
2006-04-18 12:08:06 +02:00
unknown
750bc26998 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug18787/mysql-5.0-runtime


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
2006-04-18 11:20:18 +02:00
unknown
d9142f992e Post-review fix for BUG#18787. Renamed a local variable in
Item_func_sp::tmp_table_field() to something more descriptive.


sql/item_func.cc:
  Renamed local variable 'res' to 'field' in Item_func_sp::tmp_table_field(),
  because it is.
2006-04-18 11:16:39 +02:00
unknown
661165ee10 Fixed BUG#18949: Test case sp-goto is disabled
Removed sp-goto.test, sp-goto.result and all (disabled) GOTO code.
  Also removed some related code that's not needed any more (no possible
  unresolved label references any more, so no need to check for them).
  NB: Keeping the ER_SP_GOTO_IN_HNDLR in errmsg.txt; it might become useful
      in the future, and removing it (and thus re-enumerating error codes)
      might upset things. (Anything referring to explicit error codes.)


BitKeeper/deleted/.del-sp-goto.result~f343103c63f64b7a:
  Delete: mysql-test/r/sp-goto.result
BitKeeper/deleted/.del-sp-goto.test~5054d3f729692d3d:
  Delete: mysql-test/t/sp-goto.test
mysql-test/t/disabled.def:
  sp-goto.test no longer exists.
sql/lex.h:
  Removed (disabled) GOTO definitions.
sql/sp_head.cc:
  Removed sp_head::check_backpatch() and simplified sp_head::backpatch().
  Without GOTO, unresolved label references are not possible, so no need
  to check for them.
sql/sp_head.h:
  Removed sp_head::check_backpatch(). (Not needed with no GOTO)
sql/sp_pcontext.cc:
  SP_LAB_GOTO was renamed to SP_LAB_IMPL
sql/sp_pcontext.h:
  Removed SP_LAB_REF (no longer needed) and renamed SP_LAB_GOTO
  to SP_LAB_IMPL, since it's only used for implicit labels now.
sql/sql_yacc.yy:
  Removed GOTO symbols and (disabled) code, and the no longer needed
  sp_head::check_backpatch() calls.
2006-04-18 11:07:34 +02:00
unknown
5c1b70beb8 Merge 192.168.0.20:mysql/bug13310/my50-bug13310
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2006-04-18 10:55:57 +02:00
unknown
3bcbf91376 BUG#13310 incorrect user parsing by SP
- Strip surrounding ''s from username when a new user connects. There
   is no user 'a@', it should be a@


mysql-test/r/grant2.result:
  Update test result
mysql-test/t/grant2.test:
  Add tests for bug 13310
sql/sql_parse.cc:
  Strip surrounding ''s from username when a new user connects. There 
  is no user 'a@', it should be a@
2006-04-18 10:46:17 +02:00