Commit graph

17195 commits

Author SHA1 Message Date
unknown
a94df6eed1 NdbScanOperation.cpp:
added missing return


ndb/src/ndbapi/NdbScanOperation.cpp:
  added missing return
2004-11-29 15:36:43 +00:00
unknown
98cbdf4e21 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2004-11-29 09:28:23 +01:00
unknown
d212891f6f ndb - scan bug fix + more test cases
ndb/include/ndbapi/NdbScanOperation.hpp:
  Improved doc. a bit
ndb/src/ndbapi/NdbConnectionScan.cpp:
  Set error code
ndb/src/ndbapi/NdbScanOperation.cpp:
  Check error directly after taking mutex
ndb/test/ndbapi/testScan.cpp:
  new scan test with lots of threads
ndb/test/run-test/daily-basic-tests.txt:
  Added two more scan tests
  Collapsed testTransactions & testOperations
2004-11-29 09:00:39 +01:00
unknown
2d527b72f3 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-28 21:56:43 +01:00
unknown
fe46667ad9 don't cast LEX_STRING to char* :) 2004-11-28 21:55:38 +01:00
unknown
8b244fc665 merged
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/rpl_start_stop_slave.result:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/slave.cc:
  Auto merged
mysql-test/r/select.result:
  !bk-eb
mysql-test/t/select.test:
  !bk-eb
2004-11-28 20:42:04 +01:00
unknown
1b898a2246 post-merge fix 2004-11-28 19:48:41 +01:00
unknown
46e12a2b48 Fix for division by zero problem:
* Don't try building ROR-intersect if the queried table has zero rows
 * Don't ever produce an estimate of zero returned rows.
2004-11-28 21:02:30 +03:00
unknown
dd33501f9e merged
BitKeeper/etc/logging_ok:
  auto-union
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/slave.cc:
  Auto merged
2004-11-28 18:19:01 +01:00
unknown
4c9c3f32de view.test:
more max_rows for show table status
comment spellchecking...


mysql-test/r/view.result:
  more max_rows for show table status
mysql-test/t/view.test:
  more max_rows for show table status
  comment spellchecking...
2004-11-28 18:00:42 +01:00
unknown
63c3ab1e6c limit Max_data_length in 'show table status' 2004-11-28 17:30:52 +01:00
unknown
5607539c5b bad merge fixed 2004-11-28 17:06:40 +01:00
unknown
d2c7736c59 fix for decimal.c
strings/decimal.c:
  fix
2004-11-28 16:58:05 +01:00
unknown
323284d5cd Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-28 16:32:01 +01:00
unknown
1a7783e0f6 skip last compress test if we're short of RAM 2004-11-28 16:31:14 +01:00
unknown
30db8445c1 protection: TRASH in delete
fixed a bug that it discovered


include/my_sys.h:
  move TRASH to my_sys.h from sql_list.h
sql/field.h:
  use TRASH macro
sql/item.h:
  TRASH in delete
sql/item_func.h:
  never delete item's manually!
sql/opt_range.cc:
  TRASH in delete
sql/sql_lex.h:
  TRASH in delete
sql/sql_list.h:
  move TRASH to my_sys.h from sql_list.h
sql/sql_parse.cc:
  don't use properties of deleted objects (even when it's safe)
sql/sql_select.cc:
  TRASH in delete
sql/sql_show.cc:
  TRASH in delete
sql/sql_string.h:
  TRASH in delete
2004-11-28 15:53:17 +01:00
unknown
8f60d95ce3 configure.in:
A work-around for SCO, disable use of clock_gettime


configure.in:
  A work-around for SCO, disable use of clock_gettime
2004-11-28 15:45:12 +01:00
unknown
7a1ffc062e Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-28 04:45:20 +01:00
unknown
257763a9a3 create/drop/rename user cleanup
dbug/user.r:
  help cralified
include/mysqld_error.h:
  new error message added
mysql-test/r/grant.result:
  results updated
mysql-test/r/grant2.result:
  results updated
mysql-test/t/grant.test:
  results updated
mysql-test/t/grant2.test:
  results updated
sql/share/czech/errmsg.txt:
  error message updated
sql/share/danish/errmsg.txt:
  error message updated
sql/share/dutch/errmsg.txt:
  error message updated
sql/share/english/errmsg.txt:
  error message updated
sql/share/estonian/errmsg.txt:
  error message updated
sql/share/french/errmsg.txt:
  error message updated
sql/sql_acl.cc:
  changed error reporting for create/drop/rename user to be consistent with drop table
sql/share/german/errmsg.txt:
  error message updated
sql/share/greek/errmsg.txt:
  error message updated
sql/share/hungarian/errmsg.txt:
  error message updated
sql/share/italian/errmsg.txt:
  error message updated
sql/share/japanese/errmsg.txt:
  error message updated
sql/share/korean/errmsg.txt:
  error message updated
sql/share/norwegian-ny/errmsg.txt:
  error message updated
sql/share/norwegian/errmsg.txt:
  error message updated
sql/share/polish/errmsg.txt:
  error message updated
sql/share/portuguese/errmsg.txt:
  error message updated
sql/share/romanian/errmsg.txt:
  error message updated
sql/share/russian/errmsg.txt:
  error message updated
sql/share/serbian/errmsg.txt:
  error message updated
sql/share/slovak/errmsg.txt:
  error message updated
sql/share/spanish/errmsg.txt:
  error message updated
sql/share/swedish/errmsg.txt:
  error message updated
sql/share/ukrainian/errmsg.txt:
  error message updated
2004-11-27 23:07:30 +01:00
unknown
d777a9aa6a Change sql_mode BROKEN_NOT to HIGH_NOT_PRECEDENCE 2004-11-27 19:26:46 +00:00
unknown
cf1de7d9da Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2004-11-27 14:48:24 +01:00
unknown
df1f7cab70 fix decimal2longlong too
mysql-test/r/rpl_start_stop_slave.result:
  results updated
2004-11-27 13:54:51 +01:00
unknown
4a9e7d384e mysql_priv.h:
Reverts incomplete change of insert_fields()


sql/mysql_priv.h:
  Reverts incomplete change of insert_fields()
2004-11-27 13:39:15 +01:00
unknown
87347253ce Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2004-11-27 12:37:03 +01:00
unknown
368cde22ac better overflow checks in decimal2ulonglong
better truncation check in decimal2ulonglong
2004-11-27 12:35:21 +01:00
unknown
24ad655ab5 portability fix (some printf lack of NULL support in strings) 2004-11-26 17:27:47 +02:00
unknown
24be20e8de Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-11-26 17:27:46 +02:00
unknown
7f9125b205 fixed ndb_grant test 2004-11-26 15:27:45 +00:00
unknown
65a1eb1857 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-26 15:27:44 +00:00
unknown
f01820f206 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-26 16:27:43 +01:00
unknown
9cb0bd7908 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.1
2004-11-26 18:27:42 +03:00
unknown
04d6d45f6e portability fix(for powermac)
Fix for bug#6756: Crash if SHOW INDEX


mysql-test/r/information_schema.result:
  portability fix(for powermac)
mysql-test/t/information_schema.test:
  portability fix(for powermac)
2004-11-26 18:26:52 +03:00
unknown
12163e0893 portability fix (some printf lack of NULL support in strings) 2004-11-26 16:30:20 +02:00
unknown
42af43e375 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
2004-11-26 13:44:49 +00:00
unknown
b0d586e564 added error code message for 897 2004-11-26 13:20:48 +00:00
unknown
59abcd447c srv0srv.c:
srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1


innobase/srv/srv0srv.c:
  srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1
2004-11-26 13:16:37 +02:00
unknown
8d97c01366 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-11-26 13:03:46 +02:00
unknown
a6b14b8d72 wl2126 - ndb - batching of range scans
between 80% and 360% performance improvement measured


ndb/docs/wl2077.txt:
  Update figures after batching of range scans and pekka's blob fixes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Don't close scan if other ranges exists
2004-11-26 11:34:59 +01:00
unknown
88ac05648d fixed redifinition of variable 2004-11-26 12:28:12 +02:00
unknown
92e9f24dc2 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
2004-11-26 11:19:40 +01:00
unknown
2c2333e5f2 Changed test to remove node name from output.
(was from WL#2050 - CREATE USER and DROP USER and RENAME USER)


mysql-test/r/grant2.result:
  Replaced test results after removing node name from output.
  (was from WL#2050 - CREATE USER and DROP USER and RENAME USER)
2004-11-26 11:18:20 +01:00
unknown
31e9caa05c Portability fix: we had problems with -1.1E-38, -2.2E-308 values
on 64-bit platforms (due to compiler's optimization).
-1.1E-38  replaced with -1.1E-37
-2.2E-308 replaced with -2.2E-307
2004-11-26 14:02:39 +04:00
unknown
b18b1be913 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-26 09:46:13 +00:00
unknown
33d654d7e1 cleaned up code a bit
added command CONNECT in management client
    added some verbose printouts
    removed prompt printout on !isatty(0)


ndb/src/mgmapi/mgmapi.cpp:
  improved verbose printouts on connecting to management server
ndb/src/mgmclient/CommandInterpreter.cpp:
  cleaned up code a bit
  added command CONNECT in management client
  added some verbose printouts
ndb/src/mgmclient/main.cpp:
  removed prompt printout on !isatty(0)
ndb/src/mgmclient/ndb_mgmclient.hpp:
  added verbose opotion
2004-11-26 09:44:57 +00:00
unknown
a72a5f1264 merge 2004-11-26 10:13:32 +01:00
unknown
8d1171742c ndb - bugfix testScanPerf
ndb/test/ndbapi/testScanPerf.cpp:
  1) Fix so that values are read even when using -q
  2) Divide by correct number
2004-11-26 10:00:33 +01:00
unknown
60af920628 Fixes while reviewing code
(Cleanups and better bug fixes)


mysql-test/r/select.result:
  Fixed test after wrong merge
mysql-test/t/select.test:
  Fixed test after wrong merge
scripts/mysql_fix_privilege_tables.sh:
  Don't read defaults files
sql/item_cmpfunc.cc:
  Fix wrong value for not_null_tables_cache
sql/item_cmpfunc.h:
  Remove wrong patch (flags are set in fix_length_and_dec())
sql/item_func.h:
  Fix wrong value for not_null_tables_cache
sql/slave.cc:
  Fixed indentation
2004-11-26 02:31:22 +02:00
unknown
5557ae747e ha_innodb.cc:
Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error


sql/ha_innodb.cc:
  Add conversion of the InnoDB error DB_LOCK_TABLE_FULL to the corresponding MySQL error
2004-11-26 00:26:35 +02:00
unknown
a560f0fa38 Many files:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup


innobase/buf/buf0buf.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/buf/buf0lru.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/buf0lru.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/db0err.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/row0sel.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/include/ut0mem.h:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/mem/mem0pool.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/row/row0mysql.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/row/row0sel.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/srv/srv0start.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
innobase/ut/ut0mem.c:
  Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
2004-11-26 00:12:50 +02:00
unknown
036a61c241 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-wl2050-new
2004-11-25 22:48:59 +01:00