Commit graph

15461 commits

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


sql/sql_parse.cc:
  Auto merged
2004-10-22 22:44:08 +02:00
unknown
2c32fdc67c correct fix for the bug #6151 2004-10-22 22:42:11 +02:00
unknown
d871ea8aa8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-10-22 22:29:43 +02:00
unknown
060fc681ab - applied portability fix for Windows (1ULL -> ULL(1)) to myisampack.c
myisam/myisampack.c:
   - applied portability fix for Windows (1ULL -> ULL(1))
2004-10-22 22:26:57 +02:00
unknown
0c7ac260e0 sql_acl.cc:
Correcting problem with merge


sql/sql_acl.cc:
  Correcting problem with merge
2004-10-22 14:32:23 -05:00
unknown
6ffd23d61f Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
2004-10-22 14:21:35 -05:00
unknown
8f06815657 After-merge fixes. 2004-10-22 14:19:42 -05:00
unknown
7275d29eb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-6088
2004-10-22 23:06:24 +04:00
unknown
0798c99db1 Post merge fix (test results) 2004-10-22 23:05:48 +04:00
unknown
61c1dd02f3 Manual merge
mysql-test/r/ps.result:
  Manual merge.
2004-10-22 22:55:49 +04:00
unknown
cac908520c Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db()
function crashes server" with main tree.
2004-10-22 22:51:55 +04:00
unknown
9b5cf9464c A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values for
prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY 
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
options in case of single select.


mysql-test/r/ps.result:
  Test results fixed: the test case for Bug#6088
mysql-test/r/subselect.result:
  Test results fixed: now we don't perform ORDER BY for parts of UNION
  if there is no LIMIT clause.
mysql-test/t/ps.test:
  A test case for Bug#6088 "FOUND_ROWS returns wrong values for
   prepared statements when LIMIT is used".
sql/sql_union.cc:
  The actual fix for Bug#6088:
  - don't modify SELECT_LEX'es
  - use boolean variable can_skip_order_by to check if we can skip
    ORDER BY in UNION
2004-10-22 22:51:16 +04:00
unknown
9df51cf3c3 sql_acl.cc:
BUG #5831  Post-review changes, merging improvements from Monty.


sql/sql_acl.cc:
  BUG #5831  Post-review changes, merging improvements from Monty.
2004-10-22 13:41:40 -05:00
unknown
1e9bf28ba4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_parse.cc:
  Auto merged
2004-10-22 20:34:25 +02:00
unknown
be6e299abb added missing command names to command_name[] array 2004-10-22 20:33:10 +02:00
unknown
1b142600fe Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg6081


sql/sql_parse.cc:
  Auto merged
2004-10-22 20:59:00 +04:00
unknown
2f8b0ab3a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2004-10-22 19:51:04 +03:00
unknown
af84ae0097 After merge fixes 2004-10-22 19:50:31 +03:00
unknown
6a93166799 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
2004-10-22 20:21:57 +04:00
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
c8ef55cc41 Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db() function crashes
server" with main tree.


sql/sql_parse.cc:
  Auto merged
2004-10-22 20:21:56 +04: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
f94128716c merge
client/mysqltest.c:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  merge (use new code)
2004-10-22 19:21:55 +03:00
unknown
4ff9b60597 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix


sql/sql_parse.cc:
  Auto merged
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
1c67dea5ae Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
sql/sql_parse.cc:
  Auto merged
2004-10-22 18:46:35 +03:00
unknown
bc6652db9b Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)


client/mysql.cc:
  Fix compiler warnings
client/mysqltest.c:
  Fix wrong counting of lines
  Remove compiler warnings
heap/hp_hash.c:
  Fix compiler warnings
innobase/dict/dict0load.c:
  Fix compiler warnings
innobase/include/mem0mem.h:
  Fix compiler warnings
libmysql/client_settings.h:
  Fix compiler warnings
myisam/ft_nlq_search.c:
  Add comments about compiler warnings
myisam/rt_index.c:
  Add comments about compiler warnings
myisam/rt_mbr.c:
  Add comments about compiler warnings
mysql-test/r/ps.result:
  Test case for bug#6094
mysql-test/t/ps.test:
  Test case for bug#6094
mysys/hash.c:
  Fix compiler warnings
mysys/my_handler.c:
  Add comments about compiler warnings
mysys/my_thr_init.c:
  Add comments about compiler warnings
ndb/include/mgmapi/mgmapi.h:
  Fix compiler warnings
regex/main.c:
  Fix compiler warnings
sql/item.h:
  Fix compiler warnings
sql/item_func.h:
  Add comments about compiler warnings
sql/spatial.h:
  Add comments about compiler warnings
sql/sql_lex.h:
  Fix compiler warning
sql/sql_list.h:
  Fix compiler warning
sql/sql_parse.cc:
  Move testing of access rights of tables in CREATE ... SELECT to create_table_precheck() to fix privilege checking in CREATE ... SELECT
  (Bug #6094)
sql/sql_prepare.cc:
  Remove not needed empty line
sql/sql_string.h:
  Fix compiler warnings
strings/ctype-mb.c:
  Fix compiler warnings
2004-10-22 18:44:51 +03:00
unknown
dd126ba1a5 Part of fix for bug #6081 "Call to deprecated mysql_create_db() function
crashes server"

(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).


sql/sql_parse.cc:
  Handling of COM_CREATE_DB, COM_DROP_DB:
  We should call send_error() if mysql_create_db or mysql_drop_db
  return error (like we do it for SQL versions of these commands).
2004-10-22 19:27:43 +04: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
cfcca61a17 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
innobase/os/os0file.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
2004-10-22 14:59:59 +03: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
f18efec55a os0file.c:
Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway


innobase/os/os0file.c:
  Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
2004-10-22 10:45:00 +03: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