1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Commit Graph

12570 Commits

Author SHA1 Message Date
unknown
fa65771ed8 Additional 5.0 fix for
Bug#15098: CAST(column double TO signed int), wrong result
which was fixed originally in 4.1.


mysql-test/r/cast.result:
  Fixing test results
sql/field.cc:
  Adding a "truncated value" warning.
2006-03-29 19:31:16 +05:00
unknown
9f6cf5b6cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
2006-03-29 17:28:40 +03:00
unknown
a754f1befd Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 15:41:13 +04:00
unknown
41e110f777 fix test in --ps-protocol mode
mysql-test/t/csv.test:
  fix test. In --ps-protocol mode warnings are eaten by the test suite.
  Disable ps-protocol mode for the statements, which throw the warnings
  we look for.
2006-03-29 15:37:42 +04:00
unknown
59eaf292de Fixed compiler and valgrind warnings
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.

Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests


BitKeeper/etc/ignore:
  added mysql-test/r/*.log
client/mysqltest.c:
  Change type of variables to get rid of compiler warnings
  More debugging
  Fix memory leak
mysql-test/mysql-test-run.sh:
  Collect warnings about missing DBUG_RETURN statements
mysql-test/r/lock_multi.result:
  Add test of new code
mysql-test/r/ndb_condition_pushdown.result:
  Drop used tables before test
mysql-test/t/lock_multi.test:
  Add test of new code
mysql-test/t/ndb_condition_pushdown.test:
  Drop used tables before test
mysql-test/valgrind.supp:
  Ignore 'safe' warnings from libz (when used with archive)
sql/event.cc:
  More comments
  Simplify code
  Fixed memory leak found by valgrind
sql/ha_archive.cc:
  Remove compiler warnings (Wrong handlerton structure and signed/unsigned comparison)
sql/ha_berkeley.cc:
  Fixed compiler warning
sql/ha_blackhole.cc:
  Fixed compiler warning
sql/ha_federated.cc:
  Fixed compiler warning
sql/ha_heap.cc:
  Fixed compiler warning
sql/ha_myisam.cc:
  Fixed compiler warning
sql/ha_myisammrg.cc:
  Fixed compiler warning
sql/ha_ndbcluster.cc:
  Fixed compiler warnings
sql/ha_partition.cc:
  Fixed compiler warning
  Fixed error noticed by valgrind in ha_partition::rnd_init()
sql/handler.cc:
  Fixed compiler warning
sql/handler.h:
  Fixed compiler warning
sql/item.cc:
  Fixed compiler warning
sql/item_xmlfunc.cc:
  Fixed warning from valgrind when calling memcpy with wrong address
sql/lock.cc:
  More debugging
sql/log.cc:
  Fixed compiler warning
  Indentation fixes
sql/log.h:
  Fixed compiler warning
sql/mysql_priv.h:
  Changed prototype for 'drop_locked_tables'
sql/opt_range.cc:
  Indentation fix
sql/password.c:
  Removed compiler warnings
sql/set_var.cc:
  Fixed compiler warning
sql/slave.cc:
  Fixed compiler warning
sql/sp_head.cc:
  Fixed compiler warning
sql/sql_acl.cc:
  Fixed compiler warning
sql/sql_analyse.cc:
  Added missing DBUG_RETURN statements
sql/sql_base.cc:
  Removed de-reference of not initialized pointer
  More comments
  drop_locked_tables() changed to not delete tables used for name locking
  Fixed compiler warnings
sql/sql_delete.cc:
  Fixed usage of not initialized variable
  (deleted could be referenced in some not common error conditions)
sql/sql_parse.cc:
  Added missing DBUG_VOID_RETURN
  Simplify code
sql/sql_partition.cc:
  Fixed usage of wrong variable (noticed by valgrind)
sql/sql_plugin.cc:
  Removed compiler warning
sql/sql_show.cc:
  Removed compiler warning
sql/sql_table.cc:
  Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
  This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
  This will allow Tomas to continue with his work to use namelocks to syncronize things.
  
  Fixed wrong test of 'table_type' (path_length could otherwise be accessed uninitialized)
  
  Remove compile warnings about not initialized variables.
sql/sql_yacc.yy:
  Ensure that no_write_to_binlog is properly initialized
  (Was accessed uninitialized by partition code)
sql/table.cc:
  Removed valgrind warnings (not fatal)
  Removed compiler warnings
sql/tztime.cc:
  Removed valgrind warning
storage/ndb/include/ndbapi/NdbIndexStat.hpp:
  Removed compiler warning
2006-03-29 14:27:36 +03:00
unknown
1b45888854 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mysql.com:/home/dlenev/mysql-5.0-bg17764


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-03-29 14:55:04 +04:00
unknown
1d166b1760 Proposed fix for bug #17764 "Trigger crashes MyISAM table"
A table with an on insert trigger was reported as crashed when the insert
was processed with bulk insert mode on (handler::start_bulk_insert).
The trigger was also selecting from the same table, and that caused
the "crash".
The same problem was present when an insert statement, which was processed
in bulk mode, also used a stored function that was reading the same table.

This fix disables bulk inserts if a statement uses functions or invokes
triggers. Implementing more granular checks will require much more code and
therefore can hardly be done in 5.0


mysql-test/r/trigger.result:
  Added test bug #17764 "Trigger crashes MyISAM table".
mysql-test/t/trigger.test:
  Added test bug #17764 "Trigger crashes MyISAM table".
sql/sql_insert.cc:
  We should not start bulk inserts for INSERT (or similar) statement if it uses
  functions or invokes triggers since they may access to the same table and
  therefore should not see its inconsistent state created by this optimization.
sql/sql_load.cc:
  We should not start bulk inserts for INSERT (or similar) statement if it uses
  functions or invokes triggers since they may access to the same table and
  therefore should not see its inconsistent state created by this optimization.
2006-03-29 14:53:00 +04:00
unknown
734eda5f25 Manual merge
mysql-test/mysql-test-run.pl:
  Merge
sql/mysqld.cc:
  Merge
2006-03-29 12:09:37 +02:00
unknown
077b4888c3 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv
2006-03-29 13:46:06 +04:00
unknown
7c1c4c7167 Move "start-from" into section "Control what tests to run" 2006-03-29 09:59:16 +02:00
unknown
29ca093e60 Use default value variable when printing out the default timeouts 2006-03-29 09:39:18 +02:00
unknown
1ae58ddfa4 Remove "restart-cleanup" not needed any more as a snapshot of the db will be restored after a failed test case 2006-03-29 09:30:07 +02:00
unknown
5eef76cfed "ndbcluster_port" => "ndbcluster-port"
"ndbcluster_port_slave" => "ndbcluster-port-slave"
2006-03-29 09:15:29 +02:00
unknown
c603c5acc4 "ndbconnectstring" => "ndb-connectstring" 2006-03-29 09:00:48 +02:00
unknown
9d682d54d9 Add comments for "--big-test" aka "--big" and move it to the section "Control what tests to run" 2006-03-29 08:55:29 +02:00
unknown
34c59c2453 GIS test for NDB is failing sporatically.
mysql-test/t/disabled.def:
  Disabling GIS test
2006-03-28 19:25:26 -08:00
unknown
c2f5dfef93 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-repair-csv


storage/csv/ha_tina.cc:
  Auto merged
2006-03-29 06:34:12 +04:00
unknown
2a67aecd1a Post-review fixes for WL#3154 "Enable REPAIR for CSV tables"
mysql-test/r/csv.result:
  update result file
mysql-test/t/csv.test:
  add more tests
storage/csv/ha_tina.cc:
  post-review fixes & cleanup
storage/csv/ha_tina.h:
  post-review fixes
2006-03-29 06:28:57 +04:00
unknown
a78f66971b Two additional disabled tests, trying to clear pushbuild.
mysql-test/t/disabled.def:
  Two more disabled tests
2006-03-28 18:18:27 -08:00
unknown
dac2f8893b Creating bugs, disabling tests. Trying to get the 5.1 tree clean under pushbuild.
mysql-test/t/disabled.def:
  Adding tests
2006-03-28 15:10:06 -08:00
unknown
6f2d033ca7 BUG#13520: BUG#13433: Fixed proper delimiters for fields and comments
mysql-test/r/partition.result:
  New test cases
mysql-test/t/partition.test:
  New test cases
sql/sql_partition.cc:
  Fixed proper delimiters for fields and comments
2006-03-28 17:41:50 -05:00
unknown
be236e43e0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug11151
2006-03-28 17:38:28 -05:00
unknown
e0a48a8c40 Bug#11151: LOAD DATA INFILE commits transaction in 5.0
No longer create or commit transactions within the loading of files.


mysql-test/r/loaddata.result:
  Add test result.
mysql-test/t/loaddata.test:
  Add test case.
sql/sql_load.cc:
  Loading data from a table should neither create new transactions nor destroy
  (by committing or rolling-back) existing transactions.
2006-03-28 17:15:45 -05:00
unknown
bc609ffbd0 Add new paths where to look for mysql_client_test 2006-03-28 19:32:50 +02:00
unknown
d02b57ceb8 Remove duplicate declaration of stress_basdir 2006-03-28 19:30:08 +02:00
unknown
3a60c1b389 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new
2006-03-28 20:09:07 +05:00
unknown
dfe5769a04 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-03-28 20:04:50 +05:00
unknown
53595c7020 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime
2006-03-28 17:03:14 +02:00
unknown
cdd75b46c1 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmpbuild
2006-03-28 16:35:50 +02:00
unknown
3ba8f36675 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2006-03-28 15:40:08 +02:00
unknown
a8c9bbd4be Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b15098


sql/field.cc:
  Auto merged
2006-03-28 18:32:58 +05:00
unknown
743a5055da Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2006-03-28 15:31:26 +02:00
unknown
8cf93ac629 Merge mysql.com:/usr/home/bar/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/cast.result:
  Auto merged
sql/field.cc:
  Auto merged
2006-03-28 18:24:04 +05:00
unknown
17d2b065f4 cast.result:
After merge fix.


mysql-test/r/cast.result:
  After merge fix.
2006-03-28 18:21:19 +05:00
unknown
442383892e Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime


mysql-test/r/sp-error.result:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
sql/field.h:
  Auto merged
sql/sp.cc:
  Auto merged
2006-03-28 15:08:17 +02:00
unknown
56e4b53576 ndb - bug#17729 bug#18406
Ndbapi can reorder recattr when doing sorted scan (for faster comparision)
    make sure handler maps correct recattr to correct mysql column


mysql-test/r/ndb_read_multi_range.result:
  bug#17729
mysql-test/t/ndb_read_multi_range.test:
  bug#17729
sql/ha_ndbcluster.cc:
  Make sure to map correct rec-attr against correct mysql column
    (ndbapi reorders when doing sorted scan)
2006-03-28 14:38:16 +02:00
unknown
27000fb555 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
2006-03-28 17:26:45 +05:00
unknown
44517ca040 Bug#18053 Partitions: crash if null
Bug#18070 Partitions: wrong result on WHERE ... IS NULL
 removed unnecessary code
 added handling of NULL values


mysql-test/r/partition.result:
  Bug#18053 Partitions: crash if null
  Bug#18070 Partitions: wrong result on WHERE ... IS NULL
   test case
mysql-test/t/partition.test:
  Bug#18053 Partitions: crash if null
  Bug#18070 Partitions: wrong result on WHERE ... IS NULL
   test case
sql/opt_range.cc:
  Bug#18053 Partitions: crash if null
  Bug#18070 Partitions: wrong result on WHERE ... IS NULL
   initialisation of part_iter.has_null_value
sql/sql_partition.h:
  Bug#18053 Partitions: crash if null
  Bug#18070 Partitions: wrong result on WHERE ... IS NULL
   added has_null_value
2006-03-28 17:25:19 +05:00
unknown
9a139c3adb Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug16474/mysql-5.0-runtime


mysql-test/t/sp.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.
2006-03-28 14:18:47 +02:00
unknown
537ec1e6df Post review fixes for BUG#16474: SP crashed MySQL.
mysql-test/r/ps.result:
  Added test coverage for "order by" in prepared statements (related to BUG#16474).
mysql-test/r/sp.result:
  Added reference to test case for BUG#16474.
mysql-test/t/ps.test:
  Added test coverage for "order by" in prepared statements (related to BUG#16474).
mysql-test/t/sp.test:
  Added reference to test case for BUG#16474.
sql/sql_select.cc:
  Fixed comment and test for basic_const_item() instead of is_splocal().
2006-03-28 14:16:21 +02:00
unknown
e1cd462ea6 Merge mysql.com:/usr/home/bar/mysql-4.1.b15098
into  mysql.com:/usr/home/bar/mysql-5.0
Bug#15098


mysql-test/t/cast.test:
  Auto merged
mysql-test/r/cast.result:
  After merge fix
sql/field.cc:
  After merge fix
2006-03-28 17:07:26 +05:00
unknown
c5515cc6ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-03-28 13:28:36 +02:00
unknown
e0fffb52e0 update result 2006-03-28 13:28:35 +02:00
unknown
58ad72d68a Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/ndb_insert.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-03-28 13:28:34 +02:00
unknown
920e356248 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug14356
2006-03-28 13:28:34 +02:00
unknown
fb17414ba1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-03-28 13:28:33 +02:00
unknown
1d73c16b87 A fix and a test case for Bug#15683 "crash, Function on nested
VIEWs, Prepared statement": we didn't mark the nested views
as 'prelockng placeholders' when building the prelocking list. 
This resulted in these views being processed (merged, materialized)
before they are actually used. 


mysql-test/r/sp-prelocking.result:
  Test results fixed (Bug#15683)
mysql-test/t/sp-prelocking.test:
  Add a test case for Bug#15683
sql/sql_view.cc:
  When initializing tables used in a view, inherite 
  its 'prelocking_placeholder' flag. This flag is set when we're 
  opening the view in order to build the prelocking list for a query.
  In this case we should only calculate the list to 
  prelock, and should not merge neither this view nor any of the 
  nested views, of there are any. The flag is used to indicate this 
  mode.
2006-03-28 15:06:29 +04:00
unknown
530cd1575a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  manual merge
2006-03-28 11:47:49 +02:00
unknown
8f7990e0c0 Merge bk-internal:/home/bk/mysql-5.1-new
into  shellback.:C:/mysql/mysql-5.1-new
2006-03-28 11:17:23 +02:00
unknown
fd1303ead7 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug14356


mysql-test/r/events.result:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/t/events.test:
  Auto merged
mysql-test/t/events_bugs.test:
  Auto merged
2006-03-28 10:42:46 +02:00