Commit graph

17223 commits

Author SHA1 Message Date
unknown
34944e9567 wl2126 - ndb - for for null in unique index wrt read_multi_range
sql/ha_ndbcluster.cc:
  New method for set_index_key
  Check null_in_key for read_multi_range
sql/ha_ndbcluster.h:
  New method for set_index_key
2004-11-30 13:37:03 +01:00
unknown
924a803fc1 Merge mysql.com:/home/jonas/src/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-11-30 08:47:53 +01:00
unknown
857bd559ec ndb - Fixed INCORRECT result file for unique index test
mysql-test/r/ndb_index_unique.result:
  Fixed INCORRECT result file for unique index test! SHAME!
2004-11-30 08:42:42 +01:00
unknown
ef3d635db1 wl2126 - ndb batch - post review fixes
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  renamed set_new_bound to end_of_bound
ndb/src/ndbapi/NdbIndexOperation.cpp:
  remove code for TCINDXREF
ndb/src/ndbapi/NdbScanOperation.cpp:
  renamed methods
ndb/test/ndbapi/testScanPerf.cpp:
  renamed method
sql/ha_ndbcluster.cc:
  renamed method
  add lots of comments
2004-11-30 07:58:55 +01:00
unknown
88b177a51f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2004-11-30 07:46:52 +01:00
unknown
07a65fcee7 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-11-30 07:45:49 +01:00
unknown
94a5379fbe ndb - fixed long overdue problems with unique indexes and null values
mysql-test/r/ndb_index_unique.result:
  Test of unique index and null
mysql-test/t/ndb_index_unique.test:
  Test of unique index and null
sql/ha_ndbcluster.cc:
  Fixed long overdue problems with unique indexes and null values
2004-11-30 07:41:26 +01:00
unknown
30c54408a1 Merge 2004-11-29 20:15:48 -08:00
unknown
f52e64ccff Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-29 22:49:00 +01:00
unknown
26fe328995 compatibility fixes
mysql-test/r/strict.result:
  fixed
mysql-test/r/view.result:
  rolled back
mysql-test/t/information_schema.test:
  fix for 2GB file size limit
mysql-test/t/ps_1general.test:
  fix for 2GB file size limit
mysql-test/t/view.test:
  fix for 2GB file size limit
sql/field.cc:
  double->int conversion troubles
  cleanup
sql/item_cmpfunc.h:
  warning fixed
sql/sql_select.cc:
  division by zero fixed
2004-11-29 22:47:50 +01:00
unknown
59c396e36d monty.doc:
Grammar fix.
user.r:
  A few typo fixes.


dbug/user.r:
  A few typo fixes.
dbug/monty.doc:
  Grammar fix.
2004-11-29 13:26:12 -06:00
unknown
9c678beb68 ndb_grant.later:
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later


mysql-test/t/ndb_grant.later:
  Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
2004-11-29 17:46:32 +00:00
unknown
16ae922e2a Applied some patches for Netware.
client/mysqladmin.cc:
  Added option to close the screen on exit for Netware.
netware/comp_err.def:
  Copyright notice change, for Netware.
netware/isamchk.def:
  Copyright notice change, for Netware.
netware/isamlog.def:
  Copyright notice change, for Netware.
netware/libmysql.def:
  Copyright notice change, for Netware.
netware/my_print_defaults.def:
  Copyright notice change, for Netware.
netware/myisam_ftdump.def:
  Copyright notice change, for Netware.
netware/myisamchk.def:
  Copyright notice change, for Netware.
netware/myisamlog.def:
  Copyright notice change, for Netware.
netware/myisampack.def:
  Copyright notice change, for Netware.
netware/mysql.def:
  Copyright notice change, for Netware.
netware/mysql_install.def:
  Copyright notice change, for Netware.
netware/mysql_install_db.def:
  Copyright notice change, for Netware.
netware/mysql_test_run.def:
  Copyright notice change, for Netware.
netware/mysql_waitpid.def:
  Copyright notice change, for Netware.
netware/mysqladmin.def:
  Copyright notice change, for Netware.
netware/mysqlbinlog.def:
  Copyright notice change, for Netware.
netware/mysqlcheck.def:
  Copyright notice change, for Netware.
netware/mysqld.def:
  Copyright notice change, for Netware.
netware/mysqld_safe.def:
  Copyright notice change, for Netware.
netware/mysqldump.def:
  Copyright notice change, for Netware.
netware/mysqlimport.def:
  Copyright notice change, for Netware.
netware/mysqlshow.def:
  Copyright notice change, for Netware.
netware/mysqltest.def:
  Copyright notice change, for Netware.
netware/pack_isam.def:
  Copyright notice change, for Netware.
netware/perror.def:
  Copyright notice change, for Netware.
netware/replace.def:
  Copyright notice change, for Netware.
netware/resolve_stack_dump.def:
  Copyright notice change, for Netware.
netware/resolveip.def:
  Copyright notice change, for Netware.
sql/mysqld.cc:
  Changes to fix the abend on NetWare on recieving the server down and volume deactivation
  events. Do not join for the main thread if these events occur.
2004-11-29 18:32:52 +02:00
unknown
a94df6eed1 NdbScanOperation.cpp:
added missing return


ndb/src/ndbapi/NdbScanOperation.cpp:
  added missing return
2004-11-29 15:36:43 +00:00
unknown
48e5008576 wl2126 ndb read_multi_range - bugfixes + more tests
mysql-test/r/ndb_read_multi_range.result:
  add order by tests + mixed ranges
mysql-test/t/ndb_read_multi_range.test:
  add order by tests + mixed ranges
ndb/include/kernel/signaldata/TcIndx.hpp:
  removed TcIndxRef (use TcKeyRef instead)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  removed TcIndxRef (use TcKeyRef instead)
ndb/src/ndbapi/NdbIndexOperation.cpp:
  removed TcIndxRef (use TcKeyRef instead)
sql/ha_ndbcluster.cc:
  bug fixes in batched ranged access (when ordered)
2004-11-29 13:50:13 +01:00
unknown
dc80fc2d84 Adding support for archive to handle delayed inserts.
sql/examples/ha_archive.cc:
  Added support for delayed inserts. What delayed inserts mean for archive is that a sync call is not forced with the next select. Instant performance gain, plus if you aren't concerned about having a consistant read you won't be forced to have less then optimized compression.
sql/examples/ha_archive.h:
  Added flags for dalyed inserts and added table flag so that the server knows that archive can support them.
2004-11-29 01:40:25 -08:00
unknown
a26737a015 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/wl2126
2004-11-29 09:42:29 +01: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
f7662a452b wl2126 - ndb - Enable read_multi_range batching also for range scan(s)
+fix mysql code style
 +adopt to interface changes by ingo


sql/ha_ndbcluster.cc:
  Enable read_multi_range batching also for range scan(s)
   +fix mysql code style
   +adopt to interface changes by ingo
sql/ha_ndbcluster.h:
  Enable read_multi_range batching also for range scan(s)
   +fix mysql code style
   +adopt to interface changes by ingo
2004-11-26 15:15:22 +01:00