Commit graph

27567 commits

Author SHA1 Message Date
unknown
e012abb17e Reapplying patch
Check for NULLs only if we don't replace column results,
  get real results after all checks.
  (see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).

Remove two FIXME's


client/mysqltest.c:
  Reapplying patch, lost during merge
  Check for NULLs only if we don't replace column results,
    get real results after all checks.
    (see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).
  
  Remove FIXME comments since it ssemd like the function handles vertical displays and 
  even wheter the string is terminated or not is not relevant since we only append 
  as much of it to output as "len" says
2005-11-03 19:32:19 +01:00
unknown
0c46f1e700 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930


mysql-test/mysql-test-run.pl:
  Auto merged
client/mysqltest.c:
  Manual merge, will add ramils patch afterwards
2005-11-03 19:20:47 +01:00
unknown
f814e19d3d WL#2930 Adding view and cursor 'protocols' to mysqltest
- Part2, actually adding the new functionality


client/mysqltest.c:
  adding the new functionality run with views, cursor and stored procedures
mysql-test/mysql-test-run.pl:
  Adding new switches
2005-11-03 19:00:37 +01:00
unknown
a50bc7979d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 16:13:20 +01:00
unknown
fa8dafe5bb opt_range.cc:
Additional fix for bug#14093


sql/opt_range.cc:
  Additional fix for bug#14093
2005-11-03 17:43:03 +03:00
unknown
3b6168fadc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 15:02:16 +01:00
unknown
95aeaabdcc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 14:23:42 +01:00
unknown
4f2fe28773 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-14210


sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
2005-11-03 15:24:55 +03:00
unknown
3fa0dd23e0 A fix and a test case for Bug#14210 "Simple query with > operator on
large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.


mysql-test/r/sp.result:
  Test results fixed: a test case for Bug#14210
mysql-test/t/sp.test:
  A test case for Bug#14210 "Simple query with > operator on large table 
  gives server crash"
sql/handler.cc:
  - rewrite get_new_handler to accept a memory root and use it for
sql/handler.h:
  - get_new_handler declaration changed
sql/opt_range.cc:
  - get_new_handler declaration changed
sql/sql_base.cc:
  - get_new_handler declaration changed
sql/sql_select.cc:
  - the actual fix for Bug#14210. In create_myisam_from_heap we should
  create the new table handler in TABLE::mem_root, not in THD::mem_root:
  the latter is freed shortly after cursor is open.
  - adjust create_tmp_table to explicitly supply &table->mem_root
  to get_new_handler when creating a handler for a new temporary table
sql/sql_table.cc:
  - get_new_handler declaration changed
sql/table.cc:
  - get_new_handler declaration changed
sql/unireg.cc:
  - get_new_handler declaration changed
tests/mysql_client_test.c:
  A test case for Bug#14210 "Simple query with > operator on large table
   gives server crash": a C API test case is worth adding because of different
  memory allocation/freeing patterns in handling of C API and SP cursors
2005-11-03 14:20:13 +03:00
unknown
dd490fd2d5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14093-bug-5.0-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item.h:
  Auto merged
2005-11-03 13:55:08 +03:00
unknown
bb841518b9 Fix bug #14093 Query takes a lot of time when date format is not valid
Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.

convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.


sql/item.h:
  Fix bug #14093 Query takes a lot of time when date format is not valid
  To Item_int_with_ref added method real_item() which returns ref.
sql/item_cmpfunc.cc:
   Fix bug #14093 Query takes a lot of time when date format is not valid
  convert_constant_item() now allows conversion of invalid dates like 2000-01-32 to int to make it possible to use index when comparing fields with such dates.
sql/opt_range.cc:
   Fix bug #14093 Query takes a lot of time when date format is not valid
  get_mm_leaf() modified so it allows index usage for comparing fields with invalid dates like 2000-01-32.
mysql-test/r/select.result:
  Test case for bug#14093 Query takes a lot of time when date format is not valid
mysql-test/t/select.test:
  Test case for bug#14093 Query takes a lot of time when date format is not valid
2005-11-03 13:53:49 +03:00
unknown
f38c7bfd3f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug13957/my50-bug13957


configure.in:
  Auto merged
2005-11-03 11:01:13 +01:00
unknown
f8aa1db39c Bug#13957 yassl: opensrv6c compile failure
- Added some ifdefs and turn off auto template instantiation, use explicit template instantiation


configure.in:
  Use -Tno_implict to indicate that we specifiy which template should be instantiated.
  Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION
extra/yassl/src/socket_wrapper.cpp:
  Include sys/filio.h if __SCO_VERSION__ is defined
extra/yassl/src/timer.cpp:
  Dont' include files from within namespace yaSSL.
2005-11-03 10:37:49 +01:00
unknown
096f181d3a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 10:34:15 +01:00
unknown
4f1a55911d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 08:42:02 +01:00
unknown
4d65081cc5 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged
2005-11-03 11:05:34 +04:00
unknown
e2220f4766 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14466-bug-5.0-mysql


sql/table.cc:
  Auto merged
2005-11-03 01:51:47 +03:00
unknown
6b2379afeb func_gconcat.result:
Fixed wrong test case
table.cc:
  Fixed wrong DBUG_ENTER placement


sql/table.cc:
  Fixed wrong DBUG_ENTER placement
mysql-test/r/func_gconcat.result:
  Fixed wrong test case
2005-11-03 01:50:36 +03:00
unknown
4245608b35 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-02 22:06:00 +01:00
unknown
6364edc663 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-02 20:20:56 +01:00
unknown
b8633901d0 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-02 21:47:35 +03:00
unknown
b45cdbbd86 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 19:44:10 +02:00
unknown
8d13a5f4bc Fix -ansi -pedantic compilation failure 2005-11-02 20:44:09 +03:00
unknown
a8ad5d1601 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-11-02 19:28:50 +02:00
unknown
44a8096dd4 wait_for_update must unlock mutex.
(Fixed failure in rpl0000008.test)
2005-11-02 19:28:49 +02:00
unknown
62a2162c1c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-11-02 19:09:29 +02:00
unknown
11244083b9 BUG#14514
- Add tests


mysql-test/r/ndb_basic.result:
  Add test result
mysql-test/t/ndb_basic.test:
  Add test case
2005-11-02 17:34:40 +01:00
unknown
57ca4facb9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-02 18:00:13 +03:00
unknown
17149bbd14 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged
2005-11-02 18:58:25 +04:00
unknown
316e95049d BUG#14514 Creating table with packed key fails silently
include/my_base.h:
  Move HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE
sql/ha_ndbcluster.cc:
  Use HA_OPTION_CREATE_FROM_ENGINE
sql/handler.cc:
  Use HA_OPTION_CREATE_FROM_ENGINE
2005-11-02 15:53:04 +01:00
unknown
b6a711bf88 Additional fix for #13573
strings/decimal.c:
  here we can run over the buffer - need to check on overflow
2005-11-02 18:46:13 +04:00
unknown
7d49eca96b Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-11-02 16:29:00 +02:00
unknown
4e2b6133b6 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 16:28:59 +02:00
unknown
37f5c1a82c Portability fix
(BDB test failed in Intel64)


mysql-test/r/bdb.result:
  Portability fix
mysql-test/t/bdb.test:
  Portability fix
2005-11-02 16:28:58 +02:00
unknown
ec69ca57c8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysys/base64.c:
  Auto merged
2005-11-02 15:04:16 +01:00
unknown
3edfc012b9 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 15:45:26 +02:00
unknown
d76d9dcded Use --with-openssl instead of --with-yassl for now
BUILD/SETUP.sh:
  Use --with-openssl instead of --with-yassl for now
  (We need to fix that libmysqlclient_r links with a -PIC compiled yassl library before enabling yassl)
2005-11-02 15:45:25 +02:00
unknown
98d050fdf6 Portability fix, opnsrv6c
mysys/base64.c:
  Use unsigned char for d
2005-11-02 14:32:50 +01:00
unknown
3c76331f4c found problem removed
sql/sql_parse.cc:
  allow query_tables_own_last work correctly
sql/table.cc:
  fixed returning value for libmysqld
2005-11-02 15:17:57 +02:00
unknown
8c38a382a4 Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 14:57:19 +02:00
unknown
a9b6631888 Build max builds with --yassl instead of openssl
BUILD/SETUP.sh:
  Build with --yassl instead of openssl
2005-11-02 14:57:18 +02:00
unknown
94298b10ab Merge monty@192.168.0.9:/my/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-02 14:43:26 +02:00
unknown
a73b682af9 Fixed wrong merge
Optimize new pushed code


sql/item_func.cc:
  Fixed wrong merge
sql/sql_update.cc:
  Optimize new pushed code
  (There is no reason to add extra test for not common error case if code can handle it anyway)
2005-11-02 14:43:25 +02:00
unknown
256d286174 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-02 14:35:07 +02:00
unknown
b601d8f079 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner-5.0


sql/item_func.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  merge
2005-11-02 12:56:19 +02:00
unknown
768b1e5087 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged
2005-11-02 13:01:21 +04:00
unknown
02ac7bef87 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 17:07:13 -08:00
unknown
f887cdecfa Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-11-01 22:58:24 +02:00
unknown
19f78d5fdf Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/my/mysql-5.0
2005-11-01 22:15:09 +02:00
unknown
a486b3d7c5 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


scripts/mysqld_safe.sh:
  Auto merged
2005-11-01 12:15:08 -08:00