Commit graph

17223 commits

Author SHA1 Message Date
unknown
37eb8e5546 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-24 10:49:24 +01:00
unknown
dfd6ebb153 A small cleanup in sql_select.h
sql/sql_select.h:
  Remove double assingment of fields_list.
2004-11-24 12:49:00 +03:00
unknown
135cdcef24 uca-dump.c:
Use less wide spaces on the primary level,
  to avoid big diff for ctype-uca.c.


strings/uca-dump.c:
  Use less wide spaces on the primary level,
  to avoid big diff for ctype-uca.c.
2004-11-24 13:28:48 +04:00
unknown
c3da2d12f7 Fix for bug #5888 "Triggers with nonexistent columns cause packets
out of order". (final version)

Now instead of binding Item_trigger_field to TABLE objects during
trigger definition parsing at table open, we perform pass through
special list of all such objects in trigger. This allows easily check
all references to fields in old/new version of row in trigger during
execution of CREATE TRIGGER statement (this is more courtesy for users
since we can't check everything anyway).
We also report that such reference is bad by returning error from
Item_trigger_field::fix_fields() method (instead of setup_field())
This means that if trigger is broken we will bark during trigger
execution instead of trigger definition parsing at table open.
(i.e. now we allow to open tables with broken triggers).


mysql-test/r/trigger.result:
  Added test which attempts to create trigger for table referencing to
  field which does not exist in this table.
mysql-test/t/trigger.test:
  Added test which attempts to create trigger for table referencing to
  field which does not exist in this table.
sql/item.cc:
  Item_trigger_field::setup_field() now returns void. If any error
  will occur we will report it at fix_fields() stage.
sql/item.h:
  Item_trigger_field:
  - Added next_trg_field member for linking all such objects in trigger
    in one list.
  - Also setup_field() now returns void. If any error will occur we will
    report it at fix_fields() stage.
sql/mysql_priv.h:
  Added SQL_LIST::push_back() method which allows to add another SQL_LIST
  to the end of this SQL_LIST.
sql/sp_head.cc:
  sp_head::init()/reset_lex()/restore_lex():
   In order to fill global LEX::trg_table_fields (list of all 
   Item_trigger_field objects for trigger) we should init the same list
   in LEX of substatement before its parsing and merge it to global list
   after parsing.
sql/sp_head.h:
  sp_instr_trigger_field:
    Made trigger_field member public to be able to add it more easily to
    global list of all Item_trigger_field objects in trigger.
sql/sql_lex.cc:
  LEX::trg_table was removed.
sql/sql_lex.h:
  Now we are binding Item_trigger_field's to TABLE object by passing
  through specially constructed list of all such objects in this trigger
  instead of doing this during trigger definition parsing at table open.
  So we no longer need LEX::trg_table, we use LEX::trg_table_fields list
  instead.
sql/sql_parse.cc:
  mysql_execute_command():
    Since now we use trigger body for some checks in
    mysql_create_or_drop_trigger() we should destroy it only
    after calling this function.
sql/sql_trigger.cc:
  Now instead of binding Item_trigger_field to TABLE objects during
  trigger definition parsing at table open, we perform pass through
  special list of all such objects in trigger. This allows easily check
  all references to fields in old/new version of row in trigger during
  execution of CREATE TRIGGER statement (this is more courtesy for users
  since we can't check everything anyway).
  We also report that such reference is bad by returning error from
  Item_trigger_field::fix_fields() method (instead of setup_field())
  This means that if trigger is broken we will bark during trigger
  execution instead of trigger definition parsing at table open.
  (i.e. now we allow to open tables with broken triggers).
  
  Table_triggers_list::prepare_old_row_accessors() method was added to be
  able to reuse code creating Field objects referencing TABLE::record[1]
  buffer instead of TABLE::record[0].
sql/sql_trigger.h:
  Added Table_triggers_list::prepare_old_row_accessors() method to be
  able to reuse code creating Field objects referencing to TABLE::record[1]
  instead of record[0].
sql/sql_yacc.yy:
  Now instead of performing binding of Item_trigger_field objects
  to TABLE object during trigger definition parsing at table open,
  we perform this binding by passing through specially constructed
  list of all such items in trigger.
  We also check value returned from memory allocation functions.
2004-11-24 12:24:02 +03:00
unknown
e26a5dbc6a ndb - Add testcase to autotest
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  print on state on rare crash
ndb/test/run-test/daily-basic-tests.txt:
  more test cases
2004-11-24 09:39:05 +01:00
unknown
343b645ba2 ndb - debug printout
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  print state on rare crash
2004-11-24 09:36:49 +01:00
unknown
02b0e43089 ha_myisammrg was missing index_type() method bug#6756
sql/ha_myisammrg.cc:
  ha_myisammrg was missing index_type() method
sql/ha_myisammrg.h:
  ha_myisammrg was missing index_type() method
2004-11-23 22:57:04 +01:00
unknown
87ec5e46cd Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-23 22:21:04 +01:00
unknown
4607570413 wl2126 - ndb - add support for batching range scans
1) removed acc keyinfo
2) introduce handling of multiple bounds


ndb/include/kernel/signaldata/AccScan.hpp:
  Removed keyinfo from AccScan
ndb/include/kernel/signaldata/TuxBound.hpp:
  Add data word
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Added new_bound call, which is used when batching range scans
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  removed keyinfo from acc scan
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  removed scan keyinfo
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  removed scan keyinfo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  1) removed add scan,
     let LQH read keyinfo from tup instead
  2) introduce copy_bounds which handles multiple bounds
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  removed scan keyinfo
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  removed scan keyinfo
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  removed scan keyinfo
ndb/src/ndbapi/NdbScanOperation.cpp:
  handle multiple bounds
2004-11-23 22:08:47 +01:00
unknown
b915999a96 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2004-11-23 19:19:58 +01:00
unknown
ebf164b88e Fix compiler warnings on some systems. (Unused variables)
Fixed bug in DROP FUNCTION for UDFs.
Note: It still doesn't work properly, but that bug is somewhere else.


sql/sp.cc:
  Fix compiler warning on some systems. (Unused variable)
sql/sql_parse.cc:
  Fix compiler warning on some systems. (Unused variable)
  Fixed bug in DROP FUNCTION for UDFs.
  Note: It still doesn't work properly, but that bug is somewhere else.
2004-11-23 19:19:09 +01:00
unknown
a9aff01ebd Change "Do-compile" to make automatic build log analysis easier and
to run the standard tests with "--force" (default, can be switched off).


Build-tools/Do-compile:
  1) For an automated log analysis, we need a clear marker in the build log
     whether compile + link succeeded: Write it after successful "make".
  2) Ensure the standard tests are run with "--force" in the default case,
     but allow the old behaviour by an option "--one-error".
  3) Correct a typing error in the usage message.
2004-11-23 17:18:41 +01:00
unknown
7802ba97b4 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-23 16:34:27 +01:00
unknown
bbfc702ddb don't crash when trp=0 2004-11-23 16:28:51 +01:00
unknown
555e0e444f Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/mysqld.cc:
  Auto merged
2004-11-23 15:50:29 +01:00
unknown
d254f0290f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-11-23 15:41:40 +01:00
unknown
3afa86dc34 More test cases are added
Fixed bug 'using of alias with information schema tables in views'
removed compiler warnings


mysql-test/r/information_schema.result:
  More test cases are added
mysql-test/t/information_schema.test:
  More test cases are added
sql/sql_select.cc:
  Fixed bug 'using of alias with information schema tables in views'
sql/sql_show.cc:
  Fixed bug 'using of alias with information schema tables in views'
  Changed length of some columns
sql/table.h:
  Fixed bug 'using of alias with information schema tables in views'
tests/client_test.c:
  Changed length of some columns
2004-11-23 17:41:39 +03:00
unknown
f30976748c Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-23 15:35:50 +01:00
unknown
095934c6a5 use distclean in BUILD/compile* scripts to make sure .deps dirs go
away (old .Plo files in them showed to cause build problems for at
least another dev and me, and they also cause problems after .c->.cc
renames).


BUILD/FINISH.sh:
  use distclean in BUILD/compile* scripts to make sure .deps dirs go away (old .Plo files in them showed to
  +cause build problems for at least another dev and me).
2004-11-23 15:11:49 +01:00
unknown
892197ca36 use FT_MAX_WORD_LEN_FOR_SORT instead of HA_FT_MAXBYTELEN when calculating
preferred key block length for ft index
2004-11-23 15:03:16 +01:00
unknown
1860466b7b Delete: mysql-test/mysql_test_run.c 2004-11-23 18:05:13 +05:00
unknown
4039df00d0 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1bug


sql/mysqld.cc:
  Auto merged
2004-11-23 17:58:46 +05:00
unknown
14769b681c rename event_connect_request to smem_event_connect_request 2004-11-23 17:55:07 +05:00
unknown
2b65c829f6 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2004-11-23 13:09:28 +01:00
unknown
8bb47894b7 Merge joreland@build:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/wl2126


ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-11-23 10:46:28 +01:00
unknown
761573914b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2004-11-23 10:43:20 +01:00
unknown
0b6f218e71 small bug fix for ndb restarter 2004-11-23 09:12:56 +00:00
unknown
8941ac5685 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/sql_table.cc:
  Auto merged
2004-11-22 22:58:34 +01:00
unknown
e4f75be8d4 post-merge 2004-11-22 22:57:05 +01:00
unknown
6627dc7d1b merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
client/mysqltest.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/rpl000015.result:
  Auto merged
mysql-test/r/rpl_log_pos.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2004-11-22 21:33:15 +01:00
unknown
443143f334 typo fixed 2004-11-22 20:50:04 +01:00
unknown
f57d5412e4 merged
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/rpl000015.result:
  Auto merged
mysql-test/r/rpl_log_pos.result:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
2004-11-22 20:15:48 +01:00
unknown
158d655cc0 "Table file %s was created in MySQL 4.1+" is an error, not a warning 2004-11-22 19:18:35 +01:00
unknown
1dc1ad9c9a Bug#6252 - Duplicate columns in keys should fail
Added check for duplicate column in key
  Added tests and fixed tests which exploit bug


mysql-test/r/delete.result:
  Fix test as it exploited Bug#6252
mysql-test/r/innodb.result:
  Test for Bug#6126
mysql-test/r/key.result:
  Test for Bug#6126/6252
mysql-test/r/type_blob.result:
  Fix test as it exploited Bug#6252
mysql-test/t/delete.test:
  Fix test as it exploited Bug#6252
mysql-test/t/innodb.test:
  Test for Bug#6126
mysql-test/t/key.test:
  Test for Bug#6126/6252
mysql-test/t/type_blob.test:
  Fix test as it exploited Bug#6252
sql/sql_table.cc:
  Bug#6252 - Duplicate columns in keys should fail
    Added check for duplicate column.
2004-11-22 18:07:04 +00:00
unknown
0d37be0291 merged with ul
BitKeeper/etc/logging_ok:
  auto-union
Docs/Support/texi2html:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl000015.test:
  Auto merged
mysql-test/t/rpl_log_pos.test:
  Auto merged
2004-11-22 18:59:17 +01:00
unknown
f74af1b7cb ndb: fix blob performance in long transactions
ndb/include/ndbapi/NdbConnection.hpp:
  fix blob performance in long transactions
ndb/src/ndbapi/NdbConnection.cpp:
  fix blob performance in long transactions
ndb/test/ndbapi/testBlobs.cpp:
  fix blob performance in long transactions
2004-11-22 18:54:06 +01:00
unknown
e65956d067 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-11-22 18:47:23 +01:00
unknown
2934e7ebe6 ft_boolean_search.c:
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705


mysql-test/r/fulltext.result:
  bug#6705
mysql-test/t/fulltext.test:
  bug#6705
myisam/ft_boolean_search.c:
  bug#6705 - (+trunc1* +trunc2*)
2004-11-22 18:37:30 +01:00
unknown
12c0a34205 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-11-22 17:12:45 +01:00
unknown
7730590080 - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds
BitKeeper/etc/ignore:
  Added ac_available_languages_fragment to the ignore list
2004-11-22 17:08:06 +01:00
unknown
94c7e14c3b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
2004-11-22 15:53:06 +00:00
unknown
25678df9b1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-11-22 16:47:23 +01:00
unknown
dc62c0cb6b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
2004-11-22 15:47:22 +00:00
unknown
a2aa366e6e added --no-defaults to ndb_drop_table in autodiscover test 2004-11-22 15:05:51 +00:00
unknown
8d83d9dce8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
2004-11-22 17:51:33 +03:00
unknown
0715fae17b Fixed a problem with Innodb_buffer_pool_pages_latched status variable.
innobase/buf/buf0buf.c:
  Added a sanity check for buffer_pool_pages_latched status variable.
  The lack of this check resulted in weird result on windows.
2004-11-22 17:50:42 +03:00
unknown
8d96ae7573 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/tmp


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-22 15:47:55 +01:00
unknown
1f63a25d97 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
  Auto merged
ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
2004-11-22 15:28:13 +01:00
unknown
223c5d04a0 wl2077 - bug fix for SCAN_TABREF
ndb/src/ndbapi/NdbScanOperation.cpp:
  1 more fix of premature scan closure
2004-11-22 15:27:28 +01:00
unknown
8984d00706 uca-dump.c:
Better variable names in dump.
  Dump tertiary weight in reverse order, to sort upper letters before their lower counterparts.


strings/uca-dump.c:
  Better variable names in dump.
  Dump tertiary weight in reverse order, to sort upper letters before their lower counterparts.
2004-11-22 18:17:41 +04:00