Commit graph

12518 commits

Author SHA1 Message Date
unknown
cdf7471c2c Fix and test case for BUG#3649.
mysql-test/r/handler.result:
  Test case for BUG#3649
mysql-test/t/handler.test:
  Test case for BUG#3649
sql/sql_handler.cc:
  Fix for BUG#3649: when doing an index scan for an equality condition, use index_next_same to retrieve subsequent rows.
2004-05-18 22:59:43 +04:00
unknown
f4ef82910d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2004-05-18 09:56:41 -07:00
unknown
e015ee3918 Updating range_in_rows for the include file for ha_example (the main .cc file has already been updated).
sql/examples/ha_example.h:
  Updating ha_example.h for new records_in_range. ha_example.cc has already been updated.
2004-05-18 09:54:36 -07:00
unknown
c77f7ab112 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Users/mikron/patch_cluster


BitKeeper/etc/logging_ok:
  auto-union
2004-05-18 16:46:25 +02:00
unknown
934982f51a Fixed a bug in mysql-copy-right-2 script. As it was, it destroyed some ndb source
files, such as ha_ndbcluster.cc
2004-05-18 17:26:49 +03:00
unknown
056ee93c5c embedded library: fix for sending of parameters to stored procedure.
using of methods like sint2korr() doesn't work on Bigendian machines


sql/sql_prepare.cc:
  special 'embedded' patches added to almost all set_parameter_XXX functions
2004-05-18 19:13:21 +05:00
unknown
efbf373be7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3756
2004-05-18 13:56:40 +05:00
unknown
d8229afab9 don't try to purge closed logs 2004-05-18 10:29:20 +02:00
unknown
d6cf9dd9b7 fix ndb odbc compile
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-18 09:58:30 +02:00
unknown
30afc0b52b after merge fix 2004-05-18 09:56:45 +02:00
unknown
4471aadb7c A fix (Bug #3728: Missing warning in 4.1). 2004-05-18 12:16:00 +05:00
unknown
e858cd9642 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space/tomas/mysql-4.1-ndb
2004-05-18 07:20:18 +02:00
unknown
08d1de2c16 mem0pool.c:
Fix a memory corruption bug: in 32-bit computers, every 4 billionth malloc outside innodb_additional_mem_pool_size was mistreated when freeing the memory; this could corrupt the InnoDB additional mem pool and could have caused crashes anywhere, also inside MySQL, or even database corruption! the bug exists also in 3.23 and 4.1; workaround: configure innodb_additional_mem_pool_size big enough


innobase/mem/mem0pool.c:
  Fix a memory corruption bug: in 32-bit computers, every 4 billionth malloc outside innodb_additional_mem_pool_size was mistreated when freeing the memory; this could corrupt the InnoDB additional mem pool and could have caused crashes anywhere, also inside MySQL, or even database corruption! the bug exists also in 3.23 and 4.1; workaround: configure innodb_additional_mem_pool_size big enough
2004-05-18 01:53:06 +03:00
unknown
742606bafd current_thd is 0 if ha_resolve_by_name() is called when parsing command-line options 2004-05-17 18:45:59 +02:00
unknown
d4f6c7a4c7 dict0dict.c:
Allocate the table name buffer from the mem heap of a foreign key object rather than pointing to the name buffer in the table object; even though this apparently caused no bugs in RENAME, DROP, ALTER TABLE, or elsewhere, this convention was very prone to memory allocation bugs


innobase/dict/dict0dict.c:
  Allocate the table name buffer from the mem heap of a foreign key object rather than pointing to the name buffer in the table object; even though this apparently caused no bugs in RENAME, DROP, ALTER TABLE, or elsewhere, this convention was very prone to memory allocation bugs
2004-05-17 17:27:25 +03:00
unknown
84cf2d8f78 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ps


sql/sql_parse.cc:
  Auto merged
tests/client_test.c:
  Auto merged
2004-05-17 18:45:50 +05:00
unknown
31280b0624 InnoDB: srv0srv.c: Remove reference to sync0ipm.h (fix ChangeSet@1.1833)
innobase/srv/srv0srv.c:
  Remove reference to sync0ipm.h
2004-05-17 16:19:55 +03:00
unknown
93168d599d InnoDB cleanup: Remove unused function ut_printf()
innobase/ut/ut0ut.c:
  Remove unused function ut_printf()
2004-05-17 14:51:46 +03:00
unknown
f3c06fc789 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-05-17 14:41:37 +03:00
unknown
6b237533f1 InnoDB cleanup: Add const qualifiers to many char* arguments
innobase/dict/dict0dict.c:
  Replace char* arguments with const char*
innobase/dict/dict0load.c:
  Replace char* arguments with const char*
innobase/dict/dict0mem.c:
  Replace char* arguments with const char*
innobase/fil/fil0fil.c:
  Replace char* arguments with const char*
innobase/include/data0data.h:
  dfield_set_data(): add const qualifier
innobase/include/data0data.ic:
  dfield_set_data(): add const qualifier
  (temporarily shut up compiler warnings)
innobase/include/dict0dict.h:
  Replace char* arguments with const char*
innobase/include/dict0dict.ic:
  Replace char* arguments with const char*
innobase/include/dict0load.h:
  Replace char* arguments with const char*
innobase/include/dict0mem.h:
  Replace char* arguments with const char*
innobase/include/fil0fil.h:
  Replace char* arguments with const char*
innobase/include/os0file.h:
  Replace char* arguments with const char*
innobase/include/os0sync.h:
  Replace char* arguments with const char*
innobase/include/pars0pars.h:
  Replace char* arguments with const char*
innobase/include/pars0sym.h:
  Replace char* arguments with const char*
innobase/include/row0mysql.h:
  Replace char* arguments with const char*
innobase/include/row0sel.h:
  Replace char* arguments with const char*
innobase/include/trx0roll.h:
  Replace char* arguments with const char*
innobase/include/trx0sys.h:
  Replace char* arguments with const char*
innobase/include/trx0trx.h:
  Replace char* arguments with const char*
innobase/include/ut0rnd.h:
  Replace char* arguments with const char*
innobase/include/ut0rnd.ic:
  Replace char* arguments with const char*
innobase/include/ut0ut.h:
  Remove unused function ut_printf()
innobase/os/os0file.c:
  Replace char* arguments with const char*
innobase/os/os0sync.c:
  Replace char* arguments with const char*
innobase/pars/pars0pars.c:
  Replace char* arguments with const char*
innobase/pars/pars0sym.c:
  Use mem_heap_strdupl() instead of mem_heap_alloc() and memcpy()
innobase/row/row0mysql.c:
  Replace char* arguments with const char*
innobase/row/row0sel.c:
  Replace char* arguments with const char*
innobase/trx/trx0roll.c:
  Replace char* arguments with const char*
innobase/trx/trx0sys.c:
  Replace char* arguments with const char*
2004-05-17 14:40:31 +03:00
unknown
0f8cd01a1e Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2004-05-17 13:47:51 +03:00
unknown
1915bfebcb typo fixed 2004-05-17 11:10:22 +02:00
unknown
63811cb079 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-05-17 11:05:19 +02:00
unknown
484f6cb3b4 bug#3681 - order by, distinct, refer to aliased field by name
check for field_name (not only for name) in find_item_in_list, to be compatible with item->eq() that is done later


mysql-test/r/order_by.result:
  bug#3681 - order by, distinct, refer to aliased field by name
2004-05-17 11:04:12 +02:00
unknown
f948d7bb24 added newline at the end of the file. 2004-05-17 13:40:02 +05:00
unknown
3fba03f345 After merge fixes
mysql-test/r/type_float.result:
  Fix result after merge
sql/log_event.cc:
  Fixed typo
2004-05-17 11:22:30 +03:00
unknown
29f480c504 InnoDB: Remove unused module sync0ipm
BitKeeper/deleted/.del-sync0ipm.c~48eb5196b6819734:
  Delete: innobase/sync/sync0ipm.c
BitKeeper/deleted/.del-sync0ipm.h~92a27f3bd9b15164:
  Delete: innobase/include/sync0ipm.h
BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39:
  Delete: innobase/include/sync0ipm.ic
innobase/sync/makefilewin:
  Remove unused file sync0ipm.c
innobase/include/Makefile.am:
  Remove unused files sync0ipm.h and sync0ipm.ic
innobase/sync/Makefile.am:
  Remove unused file sync0ipm.c
2004-05-17 11:11:26 +03:00
unknown
4d3f8f210a Merge
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/ha_ndbcluster.h:
  SCCS merged
2004-05-17 09:57:02 +02:00
unknown
2ddc188826 Added test(s) for auto discover of frm file 2004-05-17 09:53:13 +02:00
unknown
26d2c58c59 Fixes made after running with sql-bench
sql/ha_ndbcluster.cc:
  Added new function set_primary_key_from_old_data, used from update_row to specify the primary key of the record to update.
  Simplified index_read function, to use read_range_first
  Close the active cursor if read_range_first is called on an open cursor.
  In read_range_first, map error code from HA_ERR_KEY_NOT_FOUND to HA_ERR_END_OF_FILE.
  Remove call to function waitUntilReady from check_ndb_connection, this shuold remove the delay from transactions executed when node(s) are down.
sql/ha_ndbcluster.h:
  Added new function set_primary_key_from_old_data
2004-05-17 09:51:02 +02:00
unknown
c004463171 InnoDB: Remove unused module os0shm
BitKeeper/deleted/.del-os0shm.h~72e5e03d7b74061f:
  Delete: innobase/include/os0shm.h
BitKeeper/deleted/.del-os0shm.c~489ce7f33d07ffa:
  Delete: innobase/os/os0shm.c
BitKeeper/deleted/.del-os0shm.ic~1cac6731d2a64d53:
  Delete: innobase/include/os0shm.ic
innobase/include/Makefile.am:
  Remove unused files os0shm.h and os0shm.ic
innobase/os/Makefile.am:
  Remove unused file os0shm.c
innobase/os/makefilewin:
  Remove unused file os0shm.c
2004-05-17 10:49:01 +03:00
unknown
ff23273b7a A fix (bug #3756: ISNULL(QUOTE()) returns 1 for every row after 1st NULL) 2004-05-17 12:47:16 +05:00
unknown
485caee544 flags should be sent as second arg to my_error
sql/handler.cc:
  Added the flag argument to my_error
2004-05-17 09:43:51 +02:00
unknown
c127a6be43 Updated ndb_basic test
mysql-test/r/ndb_basic.result:
  Add more tests to ndb_basic
mysql-test/t/ndb_basic.test:
  Add more tests to ndb_basic
2004-05-17 09:40:35 +02:00
unknown
6bc1a1bf2b Proposed fix for #3791 (embedded: mysql segfaults if cannot find
errmsg.sys)


client/mysql.cc:
  Checking of mysql_server_init output added
2004-05-17 12:07:58 +05:00
unknown
afe09e48e0 Proposed fix for #3744 (embedded server, wrong error message if database is
missing)


libmysqld/embedded_priv.h:
  embedded_get_error interface added
libmysqld/lib_sql.cc:
  embedded_get_error implementation/using added
libmysqld/libmysqld.c:
  embedded_get_error call added
2004-05-17 12:05:57 +05:00
unknown
a495f76c8e Merge with 4.0.20
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/eval/eval0eval.c:
  Auto merged
innobase/ibuf/ibuf0ibuf.c:
  Auto merged
innobase/include/ut0mem.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
innobase/os/os0file.c:
  Merge with 4.0.20
  Ensure that we call F_UNLCK for files on which we call F_WRLCK.
  This is to ensure that this code will be portable accross most platforms.
myisam/ft_boolean_search.c:
  Merge with 4.0.20 (keep original file)
myisam/ft_parser.c:
  Merge with 4.0.20 (keep original file)
myisam/ftdefs.h:
  Merge with 4.0.20 (keep original file)
2004-05-17 01:52:13 +03:00
unknown
8ef62cc1ef Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1


sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-05-16 14:49:32 +03:00
unknown
70f79563d9 key_cmp -> key_cmp_if_same
New records_in_range() interface (similar to read_range())
Macros for faster bitmap handling
Simplify read_range() code (#WL1786)
New general key_cmp() function to compare keys




heap/hp_hash.c:
  New records_in_range() interface
include/heap.h:
  New records_in_range() interface
include/my_base.h:
  Moved 'key_range' here so that all table handlers can use it
include/my_bitmap.h:
  Make some bitmap functions inline for faster usage in one thread
include/myisam.h:
  New records_in_range() interface
include/myisammrg.h:
  New records_in_range() interface
myisam/mi_range.c:
  New records_in_range() interface
myisam/mi_test2.c:
  New records_in_range() interface
myisam/rt_test.c:
  New records_in_range() interface
  Indentation fixes
myisam/sp_test.c:
  New records_in_range() interface
  Indentation fixes
myisammrg/myrg_range.c:
  New records_in_range() interface
mysys/my_bitmap.c:
  Make some bitmap functions inline for faster usage in one thread
sql/examples/ha_example.cc:
  New records_in_range() interface
sql/field.cc:
  Fixed indentation
sql/ha_berkeley.cc:
  New records_in_range() interface
sql/ha_berkeley.h:
  New records_in_range() interface
sql/ha_heap.cc:
  New records_in_range() interface
sql/ha_heap.h:
  New records_in_range() interface
sql/ha_innodb.cc:
  New records_in_range() interface
sql/ha_innodb.h:
  New records_in_range() interface
sql/ha_isam.cc:
  New records_in_range() interface
sql/ha_isam.h:
  New records_in_range() interface
sql/ha_myisam.cc:
  New records_in_range() interface
sql/ha_myisam.h:
  New records_in_range() interface
sql/ha_myisammrg.cc:
  New records_in_range() interface
sql/ha_myisammrg.h:
  New records_in_range() interface
sql/ha_ndbcluster.cc:
  New records_in_range() interface
sql/ha_ndbcluster.h:
  New records_in_range() interface
sql/handler.cc:
  Simplify read_range() interface:
  - Add 'eq_range' to read_range_first
  - Remove 'eq_range' parameer from read_range_next()
  - Trust values from index_next_same()
  - Simplfy compare_key() by moving key_comparision to key.cc (as this code can be reused from other places)
sql/handler.h:
  Move key_range to my_base.h to be used by external table handlers
  Simplify read_range() interface
  New records_in_range() interface
sql/key.cc:
  Rename key_cmp() to key_cmp_if_same() to make it more descriptive
  Add new key_cmp() function usable from range and handler code.
sql/mysql_priv.h:
  Prototypes for new functions
sql/opt_range.cc:
  New records_in_range() interface
  Simplify cmp_prev()
  (We can in 5.0 simplify cmp_next() the same way)
sql/opt_range.h:
  Added key_part_info to QUICK_SELECT to be able to use key_cmp() in get_next()
sql/opt_sum.cc:
  key_cmp -> key_cmp_if_same
sql/sql_acl.cc:
  key_cmp -> key_cmp_if_same
sql/sql_select.cc:
  key_cmp -> key_cmp_if_same
2004-05-16 14:48:32 +03:00
unknown
d146ea1a0f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_union.cc:
  Auto merged
2004-05-15 18:30:04 +03:00
unknown
90e87293cb Optimising UNION ALL (WL 1687) 2004-05-15 16:13:08 +03:00
unknown
05cd698f54 Fixes for #3371, #3372, #3374, #3375, #3376
libmysql/libmysql.c:
  code to fix #3772
  counting of field->max_length moved to mysql_store_stmt_result so
  it will work in libmysqld also
libmysqld/lib_sql.cc:
  to fix #3771 and #3775
  stmt->affected_rows specifying added
  code getting default values changed so it will add terminating /0 to
  values
sql/sql_parse.cc:
  to fix #3773
  silly mistake here :\
sql/sql_prepare.cc:
  to fix #3774 and #3776
  special function for datetime values in embedded server added
  unsigned flag now specified for values in embedded server
tests/client_test.c:
  this test fails if privilege-checking pars are disabled
  (it's the default for libmysqld)
2004-05-15 17:07:44 +05:00
unknown
36bce25112 merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-05-15 11:26:58 +02:00
unknown
b40430e08c bad old merge fixed
mysql-test/r/order_by.result:
  buggy results bug#3681
mysql-test/t/order_by.test:
  test for bug#3681
2004-05-15 11:20:42 +02:00
unknown
fdd4717730 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


mysql-test/r/func_encrypt.result:
  Auto merged
2004-05-15 11:58:08 +03:00
unknown
c9667f1146 Better fix for bug #3749 (bug in deleting automatic generated foreign keys)
mysql-test/r/func_encrypt.result:
  Update tests (left after sanjas last push)
mysql-test/r/innodb.result:
  Added test for bug #3749 (bug in deleting automatic generated foreign keys)
mysql-test/t/innodb.test:
  Added test for bug #3749 (bug in deleting automatic generated foreign keys)
sql/sql_class.cc:
  Updated comment
tests/client_test.c:
  Added missing mysql_stmt_close()
2004-05-15 11:57:40 +03:00
unknown
a936a28094 results fix
mysql-test/r/func_encrypt.result:
  right SELECT print
mysql-test/r/func_gconcat.result:
  make results stable
mysql-test/t/func_gconcat.test:
  make results stable
2004-05-15 11:20:43 +03:00
unknown
c96d888002 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
2004-05-15 10:15:44 +03:00
unknown
fa163d0ba5 Extra safety fixes (probably not needed, but can't hurt)
sql/ha_innodb.cc:
  simple optimization
sql/sql_show.cc:
  Simple optimization
2004-05-15 09:08:03 +03:00
unknown
5c7ed1462e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-05-14 23:09:03 +02:00