Commit graph

28816 commits

Author SHA1 Message Date
unknown
d0fb23385d Fixed bug #16603.
A subquery transformation changes the HAVING clause of the embedding query if the subquery contains
a GROUP BY clause. Yet the split_sum_func2 function was not applied to the modified HAVING clause.
This could result in wrong answers.


mysql-test/r/subselect.result:
  Added a test case for bug #16603.
mysql-test/t/subselect.test:
  Added a test case for bug #16603.
2006-02-13 18:50:06 -08:00
unknown
550a988ac9 Merge mysql.com:/usr/home/ram/work/4.1.heap
into  mysql.com:/usr/home/ram/work/mysql-5.0


mysql-test/t/heap.test:
  Auto merged
mysql-test/r/heap.result:
  merge
2006-02-09 18:23:37 +04:00
unknown
bd1be0279c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-09 15:13:20 +02:00
unknown
36b485a367 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2006-02-09 10:35:47 +01:00
unknown
fb601b1304 Force stop of old cluster
mysql-test/mysql-test-run.pl:
  Set $using_ndbcluster_master to 1 if cluster is supported, to force a stop of old running cluster
2006-02-09 10:25:14 +01:00
unknown
472362a8d3 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2006-02-09 09:57:07 +01:00
unknown
406d0ea5ac Start cluster only for testcases that really needs it and stop it when
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not 
need to be contacted for each table to be dropped or created.
Backport from 5.1


mysql-test/lib/mtr_cases.pl:
  Mark all test cases where name contains "ndb" as ndbcluster needed
mysql-test/lib/mtr_match.pl:
  Add mtr_match_substring function
mysql-test/lib/mtr_stress.pl:
  Extre param to mysqld_start
mysql-test/mysql-test-run.pl:
  Only start ndbcluster for testcases that needs it.
2006-02-09 09:40:48 +01:00
unknown
d7340a08c0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-09 10:26:06 +02:00
unknown
5ffc2dc202 Bug #17235 perror prints wrong prefix for ndb error codes 2006-02-08 17:17:27 +01:00
unknown
64baa9dd7a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-08 14:08:45 +01:00
unknown
73bc11f4f3 Bug#17233, disabled test in waiting for bug fix 2006-02-08 14:07:52 +01:00
unknown
1a27a433fc Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed'). 2006-02-08 16:00:39 +04:00
unknown
444f8869e2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-08 10:36:42 +02:00
unknown
5b9cdaa479 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2006-02-07 21:52:56 +01:00
unknown
acdf718959 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0


mysql-test/t/kill.test:
  Auto merged
mysql-test/r/kill.result:
  merge
2006-02-07 22:10:44 +02:00
unknown
217882ad7d Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com.:/data/BK/mysql-5.0
2006-02-07 20:50:28 +01:00
unknown
588613d2ae Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50


sql/ha_ndbcluster.cc:
  Auto merged
2006-02-07 20:04:54 +01:00
unknown
245948654d ndb - bug#15918 fix
mysql-test/r/ndb_index_unique.result:
  bug#15918 fix
mysql-test/t/ndb_index_unique.test:
  bug#15918 fix
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  bug#15918 fix
sql/ha_ndbcluster.cc:
  bug#15918 fix
sql/ha_ndbcluster.h:
  bug#15918 fix
2006-02-07 19:57:31 +01:00
unknown
895d09469a ndb - add option ndbd --foreground for manual debugging
ndb/src/kernel/main.cpp:
  add option ndbd --foreground for manual debugging
ndb/src/kernel/vm/Configuration.cpp:
  add option ndbd --foreground for manual debugging
ndb/src/kernel/vm/Configuration.hpp:
  add option ndbd --foreground for manual debugging
2006-02-07 18:10:42 +01:00
unknown
09976a27d3 Merge mysql.com.:/data/BK/mysql-5.0
into  mysql.com.:/data/BK/mysql-5.0_8461_b
2006-02-07 17:15:12 +01:00
unknown
6321a621b3 ndb - main.cpp: avoid SEGV if fetch_configuration fails before fork
ndb/src/kernel/main.cpp:
  avoid SEGV if fetch_configuration fails before fork
2006-02-07 14:03:25 +01:00
unknown
c9bb7e1f02 item_func.cc:
fix for bug#8461

  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
  Changed the integer routine to work on integers only.
  This bug affects 4.1, 5.0 and 5.1
  Fixing in 4.1 will need to change the routine to handle different types individually.
  5.0 did had different routines for different types already just the INTEGER routine was bad.


sql/item_func.cc:
  fix for bug#8461
  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: TRUNCATE converts INTEGERS to DOUBLE and back to INTEGERS
  Both ROUND and TRUNCATE are affected by this.
  Changed the integer routine to work on integers only.
  This bug affects 4.1 5,0 and 5
  Fixing in 4.1 will need to change the routine to handle different types individually.
2006-02-07 13:26:35 +01:00
unknown
2408644096 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2006-02-07 14:23:16 +02:00
unknown
26f7afaf35 kill.test fixed for kill on Mac OS X (which do not send OK)
mysql-test/r/kill.result:
  This result chenged because of the correspondent test change.
mysql-test/t/kill.test:
  This test fixed for kill on Mac OS X (which do not send OK)
2006-02-07 13:45:16 +02:00
unknown
79f6936d73 Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0


mysql-test/r/fulltext.result:
  Manual merge.
mysql-test/t/fulltext.test:
  Manual merge.
sql/item_func.h:
  Manual merge.
sql/sql_base.cc:
  Manual merge: use local.
2006-02-07 15:30:32 +04:00
unknown
a525b29470 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 14:49:57 +04:00
unknown
96268d4a9a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2006-02-07 11:31:52 +01:00
unknown
523d97f4dd Bug #17081 "LOAD DATA INFILE" may not load all the data 2006-02-07 11:30:42 +01:00
unknown
16c564a390 Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1


sql/item_func.h:
  Auto merged
2006-02-07 13:49:55 +04:00
unknown
0b9270009c Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 13:49:03 +04:00
unknown
95958982f6 ndb, transaction should be refgistred even if m_transaction_on is not set 2006-02-07 00:26:47 +01:00
unknown
79cc96647a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
2006-02-07 00:06:28 +01:00
unknown
8deb6616bc Bug #17154 load data infile of char values into a table of char(PK) hangs
Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data


mysql-test/r/ndb_load.result:
  New BitKeeper file ``mysql-test/r/ndb_load.result''
mysql-test/t/ndb_load.test:
  New BitKeeper file ``mysql-test/t/ndb_load.test''
2006-02-07 00:03:39 +01:00
unknown
2ba25676d7 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-06 11:40:39 -08:00
unknown
d8c96f286f Fixed bug #16203.
If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.


mysql-test/r/group_min_max.result:
  Added a test case for bug #16203.
mysql-test/t/group_min_max.test:
  Added a test case for bug #16203.
2006-02-06 11:35:13 -08:00
unknown
18aba0411e Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0


sql/sql_parse.cc:
  Auto merged
2006-02-06 17:58:15 +01:00
unknown
5f2b9f4f7c Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0


mysql-test/t/sp-destruct.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2006-02-06 16:07:13 +01:00
unknown
466c30c11f Updated sp-code.result after merge (BUG#16568)
mysql-test/r/sp-code.result:
  Updated result after merge (BUG#16568)
2006-02-06 16:05:46 +01:00
unknown
fa461152ef Merge mysql.com:/extern/mysql/bk/mysql-5.0
into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-02-06 14:09:14 +01:00
unknown
b948741b6b ndb - testBlobs needs more tx in 5.0 ?
ndb/test/ndbapi/testBlobs.cpp:
  more tx per Ndb
2006-02-05 23:06:08 +01:00
unknown
eab7743b50 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/space/pekka/ndb/version/my50
2006-02-05 22:51:13 +01:00
unknown
1076e176ce ndb - bug#16693 (4.1) test + workaround, analyze later
ndb/test/ndbapi/testBlobs.cpp:
  do batched deletes + list commit across open cursor test cases
ndb/tools/delete_all.cpp:
  if blobs, no commit across open cursor (single trans)
  cases listed in testBlobs.cpp, analyze later (in 5.0 maybe)
2006-02-05 22:12:06 +01:00
unknown
26a81f6fb1 Merge mysql.com:/space/pekka/ndb/version/my41
into  mysql.com:/space/pekka/ndb/version/my50


mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  ul
2006-02-03 15:27:26 +01:00
unknown
b301e65883 ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ]
mysql-test/r/ndb_blob.result:
  replace+tinyblob back-patch from 5.0
mysql-test/t/ndb_blob.test:
  replace+tinyblob back-patch from 5.0
ndb/src/ndbapi/NdbBlob.cpp:
  replace+tinyblob back-patch from 5.0
2006-02-03 15:23:58 +01:00
unknown
44d113b14a ndb - bugfix: tinyblob + replace => mysqld crash (no bug#)
mysql-test/r/ndb_blob.result:
  do not delete unknown parts of tinyblob
mysql-test/t/ndb_blob.test:
  do not delete unknown parts of tinyblob
ndb/src/ndbapi/NdbBlob.cpp:
  do not delete unknown parts of tinyblob
2006-02-03 14:35:29 +01:00
unknown
394c88df3a BUG#16893: Crash in test 'fulltext_order_by'
Fixed that fulltext query + union results in unexpected behaviour.


sql/item_func.h:
  Remove access to table object from cleanup() as the table object
  may have been dropped earlier (In case of temporary tables or of
  close_thread_tables() is run before cleanup())
  This fixed a bug with access to already freed memory
sql/sql_base.cc:
  Reset variables used by fulltext
2006-02-03 14:09:33 +04:00
unknown
f4266bc468 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-02-03 00:07:57 -08:00
unknown
ac21d0294d Fixes after manual merge 2006-02-02 23:56:08 -08:00
unknown
8300149963 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/t/having.test:
  Auto merged
mysql-test/r/having.result:
  Manual merge
sql/sql_lex.cc:
  Manual merge
sql/sql_lex.h:
  Manual merge
sql/sql_prepare.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
2006-02-02 21:23:36 -08:00
unknown
6757503847 Post-review fix for bug #14927. 2006-02-02 20:37:58 -08:00