Commit graph

15430 commits

Author SHA1 Message Date
unknown
85d04ccebd Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


myisam/myisamchk.c:
  Auto merged
2004-10-22 18:21:56 +02:00
unknown
1cd249e0ed Followup to fix for bug#6050: fix valgrind warnings.
sql/item.cc:
  Fix valgrind errors: we need Item::name to point to PS memory
  as well.
sql/item.h:
  set_field no longer can be reused as is for PS purposes.
sql/sql_union.cc:
  Item_field::set_field -> Item_field::reset_field.
2004-10-22 20:21:55 +04:00
unknown
4edadc7949 Fixed a bug in vis.c
cmd-line-utils/libedit/np/vis.c:
  Fixed a compiler issue for QNX.
2004-10-22 19:21:54 +03:00
unknown
1cbad77b8e Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest


ndb/tools/waiter.cpp:
  Auto merged
2004-10-22 18:21:53 +02:00
unknown
bdf4e17f85 Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis
2004-10-22 18:21:52 +02:00
unknown
236e588a73 removing compiler warnings 2004-10-22 16:21:51 +00:00
unknown
f74303af57 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-22 15:22:47 +00:00
unknown
2f6dc4705d Add extra include on OSF1 (to let c++ program use stdint.h) 2004-10-22 15:20:15 +00:00
unknown
27fa5d4853 AIX compile fixes
ndb/include/kernel/signaldata/UpgradeStartup.hpp:
  Forward declaration
ndb/include/ndb_global.h:
  Fix for AIX
ndb/include/ndb_types.h:
  Always use ndb_global instead of my_global (or anything else)
ndb/include/ndbapi/Ndb.hpp:
  Forward declaration
ndb/include/ndbapi/NdbReceiver.hpp:
  Forward declaration
ndb/include/ndbapi/NdbScanOperation.hpp:
  Forward declaration
ndb/src/common/util/ConfigValues.cpp:
  Always use ndb_global instead of my_global (or anything else)
ndb/src/kernel/blocks/backup/restore/Restore.hpp:
  Forward declaration
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Move read/update function into Dbtup
ndb/src/mgmsrv/SignalQueue.cpp:
  Always use ndb_global instead of my_global (or anything else)
ndb/tools/waiter.cpp:
  Always use ndb_global instead of my_global (or anything else)
2004-10-22 15:13:06 +00:00
unknown
9ccbdc6b61 remove compiler warnings 2004-10-22 16:57:19 +02:00
unknown
bf29d8de38 Merge
client/mysqltest.c:
  Bug #46Bug#4640 mysql-test-run terminates when the test case includes sjis characters with '5C'
2004-10-22 15:41:56 +02:00
unknown
8c391e7c2c A test case for Bug#6046: no fix is needed (the bug is already
fixed in the main tree).
2004-10-22 15:59:59 +04:00
unknown
ca8be36f3a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6050


sql/sql_class.h:
  Auto merged
2004-10-22 15:59:58 +04:00
unknown
76b09dd518 fix c++ style comments in .h and .c files
compilation problems on some platforms'
2004-10-22 11:59:57 +00:00
unknown
4512a46e65 A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field
names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.


mysql-test/r/ps.result:
  Test results fixed: the test case for Bug#6050
mysql-test/r/ps_1general.result:
  Test results fixed: in prepared statements we expand '*' to a list
  of fully qualified fields (db.table.column).
mysql-test/t/ps.test:
  A test for Bug#6050 "EXECUTE stmt reports ambiguous fieldnames with 
  ident. tables fr. diff. schemata"
sql/item.cc:
  Revise all Item_field constructors: we need to make sure that no Item_field
  object points to unaccessible memory in prepared statements.
sql/item.h:
  Revise all Item_field constructors: we need to make sure that no Item_field
  object points to unaccessible memory in prepared statements.
sql/sql_base.cc:
  Item_field use changed to be prepared statements friendly.
sql/sql_class.h:
  New check of Item_arena state.
sql/sql_union.cc:
  Fixing the problem with name resolving in UNION and prepared statements:
  In case of SELECT a, b, c FROM t1 UNION SELECT a, b, c FROM t2 the list of
  selected items is represented as a List<Item_field>, where each 
  Item_field points to a field of temporary table.
  But the temporary table is created anew on each execution of the prepared 
  statement. So on each subsequent execution we should reset Item_field
  items to point to fields from freshly-created temporary table.
sql/table.h:
  Comment TABLE member.
2004-10-22 14:47:35 +04:00
unknown
25f1344f8c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2004-10-22 11:01:11 +02:00
unknown
33466aa35d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-22 09:01:10 +00:00
unknown
d2cdceb2aa use the right make in make_binary_distribution 2004-10-22 08:57:52 +00:00
unknown
83a00d2ea9 Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-purify2
2004-10-22 08:57:20 +02:00
unknown
d71efcfdd6 sql_parse.cc:
Bug#6167 One element missing in 'uc_update_queries[]'


sql/sql_parse.cc:
  Bug#6167 One element missing in 'uc_update_queries[]'
2004-10-22 08:54:14 +02:00
unknown
ac8c655bd8 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
2004-10-22 07:58:04 +03:00
unknown
bcf7b58318 Show table status now shows creation time of the table for InnoDB. Note that
this timestamp might not be the correct time because e.g. ALTER TABLE
changes this timestamp.


sql/ha_innodb.cc:
  Do not show check_time and update_time because we do not really know them.
  UPDATE, INSERT and CHECK TABLE do not change these timestamps.
2004-10-22 07:52:52 +03:00
unknown
d2bfd6766f mysqltest.c, mysqltest.result, mysqltest.test:
Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
  new file


mysql-test/t/mysqltest.test:
  Added SQLSTATE matching support to test engine
mysql-test/r/mysqltest.result:
  Added SQLSTATE matching support to test engine
client/mysqltest.c:
  Added SQLSTATE matching support to test engine
2004-10-22 05:56:27 +02:00
unknown
ce91fb2f89 Compile fix 2004-10-21 20:49:37 +00:00
unknown
86acc891fc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-21 19:27:46 +00:00
unknown
f3513a79b3 more snprintf... 2004-10-21 19:23:18 +00:00
unknown
7310d0d2a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-21 19:22:08 +00:00
unknown
63920158ce changed to call internal snprintf/vsnprintf 2004-10-21 19:02:01 +00:00
unknown
277c84e2b1 some platforms provide posix snprintf via special defined, these defines however cause problems elsewhere
so this is a way to only have to do this define in one file
2004-10-21 16:26:53 +00:00
unknown
aa69af3841 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
2004-10-21 20:00:54 +04:00
unknown
48dc2f0844 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-10-21 17:57:48 +02:00
unknown
7864ea211d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6059
2004-10-21 19:57:23 +04:00
unknown
120afb8ea2 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-21 17:47:05 +02:00
unknown
315b7d89eb A fix (bug #6138: MOD operator should not round non-integral argument). 2004-10-21 19:52:55 +05:00
unknown
8a1488cd39 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-21 14:52:11 +00:00
unknown
c8ad5215ea Manual merge.
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
tests/client_test.c:
  Manual merge
2004-10-21 18:44:40 +04:00
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
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
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