Commit graph

16344 commits

Author SHA1 Message Date
unknown
506f648b3a A fix and test case for bug#6059 "mysql_stmt_field_count returns
positive numbers when no resultset is available": when sending
result set metadata we need to use virtual select_result::send_fields, 
and not address protocol directly, because select_result descendents may 
intercept result set (it's the case for example for SELECT INTO OUTFILE).


sql/sql_class.h:
  A fix for bug#6059 "mysql_stmt_field_count returns positive numbers 
  when no resultset is available": introducing select_result::field_count()
  method to report actual number of fields in a result set, if any result
  set is sent to client.
sql/sql_prepare.cc:
  A fix for bug#6059 "mysql_stmt_field_count returns 
  positive numbers when no resultset is available": when sending
  result set metadata we need to use virtual select_result::send_fields, 
  and not address protocol directly, because select_result descendents may 
  intercept result set (it's the case for example for SELECT INTO OUTFILE).
  Now we need to always have lex->result set if we're in prepared statements.
tests/client_test.c:
  A test case for Bug#6059 "mysql_stmt_field_count returns positive 
  numbers when no resultset is available"
2004-10-21 18:33:53 +04:00
unknown
0da47eae24 ctype-uca.c:
Optimization: move "space padding" code outside the loop


strings/ctype-uca.c:
  Optimization: move "space padding" code outside the loop
2004-10-21 19:17:04 +05:00
unknown
5f8337fcae Fixed Bug#6109, 'mysql' command line client segfaults on 'quit' command.
It also did not write ~/.mysql_history file. The problem was in alloc(),
which probably does not work on HP-UX-11.23 ia64 platform. Changed some
macros into functions for better maintenance and debugging.
2004-10-21 17:17:03 +03:00
unknown
6044a07fd3 one warning out, one warning in :-), forgot the argument in assert() 2004-10-21 14:17:02 +00:00
unknown
6357bc75b9 workaround for Sun Forte compile problem for ndb on solaris 2.10 2004-10-21 14:11:20 +00:00
unknown
0ea0422907 value should be checked after 'before' trigger work (BUG#5992)
mysql-test/r/view.result:
  changing value by trigger and CHECK OPTION
mysql-test/t/view.test:
  changing value by trigger and CHECK OPTION
sql/sql_insert.cc:
  value should be checked after 'before' trigger work
2004-10-21 17:05:45 +03:00
unknown
97ccddddf5 Adapt 'ps_10nestset' to standard test style; correct a typing error in 'ps_11bugs'.
mysql-test/r/ps_10nestset.result:
  Correct the expected protocol according to the test changes.
mysql-test/t/ps_10nestset.test:
  Improve comments;  adapt to standard test style:
  disable warnings around 'drop table', use 't#' table name scheme.
mysql-test/t/ps_11bugs.test:
  Corrected a typing error in the bug number comment.
2004-10-21 16:02:12 +02:00
unknown
855e4dafb3 s/puts/printf/
BitKeeper/etc/ignore:
  Added Docs/Images/myaccess-odbc.txt Docs/Images/myaccess.txt Docs/Images/myarchitecture.txt Docs/Images/mydll-properties.txt Docs/Images/mydsn-example.txt Docs/Images/mydsn-icon.txt Docs/Images/mydsn-options.txt Docs/Images/mydsn-setup.txt Docs/Images/mydsn-test-fail.txt Docs/Images/mydsn-test-success.txt Docs/Images/mydsn-trace.txt Docs/Images/mydsn.txt Docs/Images/myflowchart.txt to the ignore list
2004-10-21 15:34:26 +02:00
unknown
16b8b7dbe5 sorry, previous comment should have been on ithanium, not IRIX 2004-10-21 13:03:59 +00:00
unknown
7e6e24a1cc use memcpy instead, other code breaks mysteriously on IRIX 2004-10-21 12:57:55 +00:00
unknown
656d21a7b8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-21 12:34:55 +00:00
unknown
81b97c4887 SHOW TABLE STATUS now prints create_time, update_time and check_time
for InnoDB tables. Note that these times may always be correct ones,
because for example ALTER TABLE creates a table again.



innobase/include/os0file.h:
  Added information of file timestamps and a function os_file_get_status
  to get that information using stat().
innobase/os/os0file.c:
  Added function that return information obout the specified file.
sql/ha_innodb.cc:
  Get timestamps for the file where the table is stored.
2004-10-21 14:57:43 +03:00
unknown
2aad30394d inserting single value with check option failed always get error (part of BUG#5995)
mysql-test/r/view.result:
  inserting single value with check option failed always get error
mysql-test/t/view.test:
  inserting single value with check option failed always get error
sql/sql_insert.cc:
  inserting single value with check option failed always get error
2004-10-21 14:32:10 +03:00
unknown
3c9d7379e0 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2004-10-21 11:27:21 +00:00
unknown
bf59c0fe3c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-21 11:24:10 +00:00
unknown
1b1ef2ea4c changed to same signature as rest of print functions
provite declarations for signal print functions, needed on some platforms
ome platforms don't like the length calculation for SignalDataPrintFunction
    so null terminate instead
ome platforms complain about this extra level Logger::Logger::
 null terminate SignalDataPrintFunctions instead
    move declaration of print function to SignalData.hpp
  just change from "" to <> in include
 moved double declatration of i out



ndb/include/kernel/signaldata/DihContinueB.hpp:
  changed to same signature as rest of print functions
ndb/include/kernel/signaldata/NdbfsContinueB.hpp:
  changed to same signature as rest of print functions
ndb/include/kernel/signaldata/SignalData.hpp:
  provite declarations for signal print functions, needed on some platforms
ndb/src/common/debugger/DebuggerNames.cpp:
  some platforms don't like the length calculation for SignalDataPrintFunction
  so null terminate instead
ndb/src/common/debugger/EventLogger.cpp:
  some platforms complain about this extra level Logger::Logger::
ndb/src/common/debugger/signaldata/ContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/DihContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp:
  changed to same signature as rest of print functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  null terminate SignalDataPrintFunctions instead
  move declaration of print function to SignalData.hpp
ndb/src/common/portlib/NdbSleep.c:
  just change from "" to <> in include
ndb/src/mgmsrv/Services.cpp:
  moved double declatration of i out
2004-10-21 11:12:15 +00:00
unknown
e9c3bc7616 fixed default behaviour of WITH CHECK OPTIONS according to standard (BUG#5989)
mysql-test/r/view.result:
  fixed default behaviour of WITH CHECK OPTIONS according to standard
sql/sql_yacc.yy:
  fixed default behaviour of WITH CHECK OPTIONS according to standard
2004-10-21 13:39:17 +03:00
unknown
9a702d8a31 compile fixes for butch
ndb/src/mgmsrv/ConfigInfo.cpp:
  Better cast
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add default arg
sql/ha_ndbcluster.cc:
  reorder methods, so that they are not used prior to declaration
  (inlines)
2004-10-21 12:39:08 +02:00
unknown
adc1bff4f8 Allow inheriting check options if view have not WHERE clause (BUG#5988)
mysql-test/r/view.result:
  test of cascaded check option for whiew without WHERE clause
mysql-test/t/view.test:
  test of cascaded check option for whiew without WHERE clause
sql/table.cc:
  Allow inheriting check options if view have not WHERE clause
2004-10-21 13:30:25 +03:00
unknown
f9300c2914 CHARSET_INFO.txt:
Typo.


strings/CHARSET_INFO.txt:
  Typo.
2004-10-21 15:18:31 +05:00
unknown
0b01d95d21 fixed printing of substring_index (BUG#5911)
mysql-test/r/func_str.result:
  fixed printing of substring_index
mysql-test/r/view.result:
  test of substring_index with view
mysql-test/t/view.test:
  test of substring_index with view
sql/item_strfunc.h:
  fixed printing of substring_index
2004-10-21 13:11:15 +03:00
unknown
2f29f9ea5f CHARSET_INFO.txt:
New comments about ctype[].


strings/CHARSET_INFO.txt:
  New comments about ctype[].
2004-10-21 15:11:01 +05:00
unknown
154a5c173d ctype_uca.result:
Forgot to commit in the previous changeset


mysql-test/r/ctype_uca.result:
  Forgot to commit in the previous changeset
2004-10-21 14:54:17 +05:00
unknown
655e1a9d8a Bug #5679 utf8_unicode_ci LIKE--trailing % doesn't equal zero characters 2004-10-21 14:48:37 +05:00
unknown
db4683c62e force assigning error handler for all mem_roots 2004-10-21 10:58:03 +03:00
unknown
8f82360081 Allow cp932 characters to be stored in a SJIS column 2004-10-21 12:17:59 +05:00
unknown
433aec148f Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/talle/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
2004-10-21 08:49:57 +03:00
unknown
e367451086 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/func_test.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2004-10-20 15:44:31 -07:00
unknown
b0cfdb95c5 func_test.result, item_cmpfunc.cc:
Fixed bug #6187: a wrong initial setting for const_item_cache
  in Item_cond::fix_fields.


sql/item_cmpfunc.cc:
  Fixed bug #6187: a wrong initial setting for const_item_cache
  in Item_cond::fix_fields.
mysql-test/r/func_test.result:
  Fixed bug #6187: a wrong initial setting for const_item_cache
  in Item_cond::fix_fields.
2004-10-20 14:52:30 -07:00
unknown
4e844b19c9 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/range.test:
  Auto merged
sql/opt_range.cc:
  Auto merged
2004-10-20 13:17:06 -07:00
unknown
89865a0c27 opt_range.cc:
Post automerge correction.


sql/opt_range.cc:
  Post automerge correction.
2004-10-20 13:16:00 -07:00
unknown
d66adc7a1f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


mysql-test/ndb/ndbcluster.sh:
  Auto merged
2004-10-20 17:36:19 +00:00
unknown
ffd77c4679 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-20 17:31:59 +00:00
unknown
44db341fdb fix so that ndb handler can cope with char(0), mapped to char(1) for now 2004-10-20 17:22:58 +00:00
unknown
7b413078cc code clean-up. 2004-10-20 21:50:55 +05:00
unknown
53eb9871ad A fix (bug #6142: SELECT DISTINCT on key field crashes server)
sql/opt_range.cc:
  A fix (bug #6142: SELECT DISTINCT on key field crashes server)
  Code clean-up.
2004-10-20 21:01:52 +05:00
unknown
10a6020ee0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


libmysql/libmysql.c:
  Auto merged
2004-10-20 18:58:01 +03:00
unknown
b76fb15ce6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-20 15:58:00 +00:00
unknown
00e930b1a2 fix for wrong use of shell test 2004-10-20 15:56:57 +00:00
unknown
64a1a5058d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-20 15:36:51 +00:00
unknown
75b6c13343 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-20 15:18:54 +00:00
unknown
4ba94cc3f9 After merge fixes 2004-10-20 17:28:40 +03:00
unknown
d432e3df36 removed some (Uint32)-1 casts 2004-10-20 13:54:24 +00:00
unknown
633eb8180a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-10-20 15:43:22 +02:00
unknown
235d0787fa NDB dbtux scan batch max 16->992 caused perf loss
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  dbtux scan batch max 16->992 caused perf loss
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  dbtux scan batch max 16->992 caused perf loss
ndb/src/kernel/blocks/dbtux/Times.txt:
  dbtux scan batch max 16->992 caused perf loss
ndb/test/ndbapi/testOIBasic.cpp:
  dbtux scan batch max 16->992 caused perf loss
2004-10-20 15:43:21 +02:00
unknown
370fa1d0e1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-20 13:43:17 +00:00
unknown
e4a86f3237 compile warning fixes
mysql-test/ndb/ndbcluster.sh:
  corrected shell test syntax
2004-10-20 13:42:41 +00:00
unknown
79a9f6185a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-secfix


sql/mysql_priv.h:
  Auto merged
2004-10-20 17:37:46 +04:00
unknown
5382a18254 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6049
2004-10-20 17:33:14 +04:00
unknown
00bbd9a252 decimal_cmp() 2004-10-20 15:26:03 +02:00