Commit graph

8883 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
unknown
76e64db211 Only run test if support partitions
mysql-test/t/partition_mgm_err2.test:
  Need support for partitions
2006-03-28 10:42:28 +02:00
unknown
16f5ad561b Filed bugs against two tests, and then disabled them.
mysql-test/t/disabled.def:
  Adding two more failing tests to the def file.
2006-03-28 00:24:13 -08:00
unknown
e39256f8f4 Added tests with IGNORE and NULL values 2006-03-28 10:01:23 +02:00
unknown
3372c31d12 Fix for Bug #15722 Engine_condition_pushdown fails when using blobs(text) 2006-03-28 09:59:20 +02:00
unknown
73970addd8 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1


include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-03-27 20:26:57 -08:00
unknown
2568c2cfed Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-03-27 20:16:52 -08:00
unknown
effd72a9ea Merge zim.(none):/home/ian/workspace/mysql-5.0
into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian


BitKeeper/etc/ignore:
  auto-union
include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Changing message to add in bug numnber
2006-03-27 19:48:44 -08:00
unknown
6da39a4c1f Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


include/mysql.h:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql-common/client.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-03-27 18:30:40 -08:00
unknown
b0654461df Fixed bug #18386.
An invalid assertion in Item_direct_view_ref::eq caused 
an assertion abort in the debug version.


mysql-test/r/view.result:
  Added a test case for bug #18386.
mysql-test/t/view.test:
  Added a test case for bug #18386.
sql/item.cc:
  Fixed bug #18386.
  An invalid assertion in Item_direct_view_ref::eq caused 
  an assertion abort in the debug version.
  Changed the assertion.
2006-03-27 18:28:55 -08:00
unknown
63605b9fd4 Disable udf test
BitKeeper/etc/ignore:
  Added mysql-test/r/udf.log to the ignore list
mysql-test/t/disabled.def:
  Disable the udf test, per bug #18564. Permission by Brian
2006-03-27 18:25:35 -08:00
unknown
cd493c5a11 Disabling test for rpl_ndb_sp007
mysql-test/t/disabled.def:
  Adding in disabled test
2006-03-27 18:08:31 -08:00
unknown
92fb31e3ef removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
compile error fixes


BitKeeper/deleted/.del-rpl_ndb_sp007.test~72c66392eed0d74:
  Delete: mysql-test/t/rpl_ndb_sp007.test
BitKeeper/deleted/.del-rpl_ndb_sp007.result~b1b713abfd655893:
  Delete: mysql-test/r/rpl_ndb_sp007.result
mysql-test/t/disabled.def:
  removed rpl_ndb_sp007 test as it uses savepoints which is only supported by innodb
sql/ha_ndbcluster.cc:
  compile error fixes
2006-03-27 19:41:37 +02:00
unknown
7c641b686a Merge mysql.com:/home/kgeorge/mysql/5.0/B15102
into  mysql.com:/home/kgeorge/mysql/5.1/B15102


netware/BUILD/compile-netware-START:
  Auto merged
2006-03-27 12:35:16 +03:00
unknown
b3230cc265 Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
Reproduced in 5.0.16-nt. Tested to work in 5.0.20
  


mysql-test/r/group_min_max.result:
  Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
    Reproduced in 5.0.16-nt. Tested to be fixed in 5.0.20
mysql-test/t/group_min_max.test:
  Test case for BUG#15102 : select distinct returns empty result, select count distinct > 0 (correct)
    Reproduced in 5.0.16-nt. Tested to be fixed in 5.0.20
2006-03-27 12:20:25 +03:00
unknown
919d0d85ac Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/dlenev/mysql-5.1-merges


configure.in:
  Auto merged
2006-03-25 19:03:09 +03:00
unknown
8e77d37f6e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug16415
2006-03-25 13:05:34 +01:00
unknown
89822edbd5 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-03-24 15:24:06 -08:00
unknown
b95fb17332 manual merge
mysql-test/r/events.result:
  Auto merged
mysql-test/t/events_bugs.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
2006-03-25 00:24:04 +01:00
unknown
538cbbc444 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/dlenev/mysql-5.1-merges


sql/sql_table.cc:
  Auto merged
2006-03-25 02:24:04 +03:00
unknown
1a53c9c3a3 Redisabled partition_03ndb, hangs 2006-03-24 18:24:03 -05:00
unknown
e753ca0ba0 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-03-24 18:22:32 -05:00
unknown
c1038471f5 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-03-24 17:34:12 -05:00
unknown
2a70440543 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-03-24 12:56:31 -08:00
unknown
a18307f582 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


mysql-test/r/join_outer.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
2006-03-24 12:46:33 -08:00
unknown
c0579144d5 Fixed bug #17164.
If the WHERE condition of a query contained an ORed FALSE term
then the set of tables whose rows cannot serve for null complements
in outer joins was determined incorrectly. It resulted in blocking 
possible conversions of outer joins into joins for such queries.


mysql-test/r/join_outer.result:
  Added a test case for bug #17164.
mysql-test/t/join_outer.test:
  Added a test case for bug #17164.
2006-03-24 12:44:54 -08:00
unknown
040397edec Merge mysql.com:/home/dlenev/mysql-5.0-bg18153
into  mysql.com:/home/dlenev/mysql-5.1-merges


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
2006-03-24 19:46:01 +03:00
unknown
c8e6cdda84 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-24 17:46:00 +01:00
unknown
6e9cd55d83 fix for bug#16415 Events names are case sensitive
mysql-test/lib/init_db.sql:
  make name not binary, then event names won't be case sensitive
mysql-test/r/events.result:
  output fix
mysql-test/r/events_bugs.result:
  update result
mysql-test/t/events_bugs.test:
  test case for bug #16415 events' names are case sensitive
scripts/mysql_create_system_tables.sh:
  make name not binary, then event names won't be case sensitive
scripts/mysql_fix_privilege_tables.sql:
  make name not binary, then event names won't be case sensitive
2006-03-24 17:45:52 +01:00
unknown
3adaea9d53 disabled test referring to bug 2006-03-24 17:41:26 +01:00
unknown
084d6e19e5 Commented out lines in disabled.def that have bug numbers that are closed
mysql-test/t/disabled.def:
  Commented out tests in disabled.def that have bug numbers that are closed
2006-03-24 09:45:44 -05:00
unknown
9501550d5a Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-03-24 13:50:41 +01:00
unknown
c62de1d5a8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/mysql-5.0-bg18153
2006-03-24 15:28:08 +03:00
unknown
84992f54b7 Enabled test rpl_ndb_insert_ignore 2006-03-24 13:26:35 +01:00