Commit graph

17388 commits

Author SHA1 Message Date
unknown
e55d50e4e3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysqltest.result:
  Auto merged
2007-04-10 18:20:27 +02:00
unknown
8e72b760aa Bug #19372:
Added a test case.
The problem was fixed by the fix for bug #17379.
The problem was that because of some conditions 
the optimizer always preferred range or full index
scan access methods to lookup access methods even
when the latter were much cheaper.


mysql-test/r/select.result:
  Bug #19372: test case.
  The problem was fixed by the patch for bug #17379
mysql-test/t/select.test:
  Bug #19372: test case.
  The problem was fixed by the patch for bug #17379
2007-04-10 19:08:08 +03:00
unknown
bfe25fb20c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/mysqltest.result:
  Auto merged
2007-04-10 17:33:21 +02:00
unknown
247c3a81a1 Update result(which mysterioulsy got lost) 2007-04-10 17:33:04 +02:00
unknown
b518d2a8bd Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B27659-5.0-opt
2007-04-10 16:57:46 +03:00
unknown
041767e123 Bug #27659:
The optimizer transforms DISTINCT into a GROUP BY
when possible.
It does that by constructing the same structure
(a list of ORDER instances) the parser makes when
parsing GROUP BY.
While doing that it also eliminates duplicates.
But if a duplicate is found it doesn't advance the
pointer to ref_pointer array, so the next 
(and subsequent) ORDER structures point to the wrong
element in the SELECT list.
Fixed by advancing the pointer in ref_pointer_array
even in the case of a duplicate.


mysql-test/r/distinct.result:
  Bug #27659: test case
mysql-test/t/distinct.test:
  Bug #27659: test case
sql/sql_select.cc:
  Bug #27659: use correct ref_pointer_array element
2007-04-10 16:55:48 +03:00
unknown
86ef70e934 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/create.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2007-04-10 14:59:46 +02:00
unknown
d76e2592a0 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 14:59:16 +02:00
unknown
76f5c73bc2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-04-10 14:58:55 +02:00
unknown
334c2cc2ea Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
client/mysqltest.c:
  Use remote
2007-04-10 14:31:33 +02:00
unknown
4788e6dfe3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  SCCS merged
2007-04-10 14:29:22 +02:00
unknown
8163d5ec6e Merge 192.168.0.4:mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
2007-04-10 13:51:32 +02:00
unknown
9f5e640d30 Give the "sync_slave_with_master" something to do 2007-04-10 12:19:00 +02:00
unknown
d2462ac367 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2007-04-10 12:15:47 +02:00
unknown
ca33c6673f Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-10 12:13:47 +02:00
unknown
a41b81e3a4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/gluh/MySQL/Bugs/5.0.27069


sql/sql_table.cc:
  Auto merged
2007-04-10 15:02:04 +05:00
unknown
5ded16c5d0 Bug#27069 set with identical elements are created(additional fix)
issue an error in strict mode
if enum|set column has duplicates members in 'create table'


mysql-test/r/strict.result:
  test case
mysql-test/t/strict.test:
  test case
sql/sql_table.cc:
  issue an error in strict mode
  if enum|set has duplicates members
2007-04-10 15:01:04 +05:00
unknown
37feda2596 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged
2007-04-09 11:46:58 +05:00
unknown
d2667d1a6e Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:45:14 +05:00
unknown
43d17730f0 Merge bk@192.168.21.1:mysql-5.1
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/sql_table.cc:
  Auto merged
2007-04-09 11:07:20 +05:00
unknown
6d9a796944 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged
2007-04-09 11:06:28 +05:00
unknown
fde3e9d4af Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-08 20:48:07 +02:00
unknown
ddaeead8fc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-08 20:46:40 +02:00
unknown
1f8dbdaf3a Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql


sql/sql_load.cc:
  Auto merged
2007-04-07 23:09:09 +04:00
unknown
a1576f9209 merging fix
mysql-test/r/windows.result:
  result fixed
2007-04-08 00:05:34 +05:00
unknown
38a12cc872 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-04-07 20:46:43 +02:00
unknown
b77c664ea8 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/etc/ignore:
  auto-union
2007-04-07 20:30:26 +02:00
unknown
3f0c44c605 after-merging fix
mysql-test/r/events_trans.result:
  result fixed
mysql-test/r/windows.result:
  merging fix
mysql-test/t/events_trans.test:
  moved to events_trans_notembedded.test
mysql-test/r/events_trans_notembedded.result:
  New BitKeeper file ``mysql-test/r/events_trans_notembedded.result''
mysql-test/t/events_trans_notembedded.test:
  New BitKeeper file ``mysql-test/t/events_trans_notembedded.test''
2007-04-07 23:16:03 +05:00
unknown
156735bd12 Merge mysql.com:/home/hf/work/26074/my51-26074
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 16:36:50 +05:00
unknown
023ae2a040 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqldump.c:
  Auto merged
mysql-test/r/rpl_packet.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/rpl_packet.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  merging
mysql-test/t/disabled.def:
  merging
sql/events.cc:
  merging
sql/sql_parse.cc:
  SCCS merged
2007-04-07 14:59:53 +05:00
unknown
b3f9c88826 Merge bk@192.168.21.1:mysql-5.0
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/field.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-07 11:36:02 +05:00
unknown
2911bcd8e3 Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-07 11:35:14 +05:00
unknown
795121926e test temporarily disabled 2007-04-07 11:31:49 +05:00
unknown
fb27844b0f Merge mysql.com:/tmp/mysql-5.0-build
into  mysql.com:/tmp/mysql-5.1-build
2007-04-07 04:22:19 +02:00
unknown
375bb35ea1 disabled test and feature 2007-04-07 00:28:09 +02:00
unknown
b5cf43c902 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 00:56:35 +04:00
unknown
35a0f47234 Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
NO_AUTO_VALUE_ON_ZERO mode.

The table->auto_increment_field_not_null variable wasn't reset after
reading a row which may lead to inserting a wrong value to the auto-increment
field to the following row.

The table->auto_increment_field_not_null variable is reset now right after a
row is being written in the read_fixed_length() and the read_sep_field()
functions.
Removed wrong setting of the table->auto_increment_field_not_null variable in
the read_sep_field() function.


mysql-test/t/loaddata.test:
  Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
  NO_AUTO_VALUE_ON_ZERO mode.
mysql-test/r/loaddata.result:
  Added a test case for the bug#27586: Wrong autoinc value assigned by LOAD DATA in the
  NO_AUTO_VALUE_ON_ZERO mode.
sql/sql_load.cc:
  Bug#27586: Wrong autoinc value assigned by LOAD DATA in the
  NO_AUTO_VALUE_ON_ZERO mode.
  The table->auto_increment_field_not_null variable is reset now right after a
  row is being written in the read_fixed_length() and the read_sep_field()
  functions.
  Remove wrong setting of the table->auto_increment_field_not_null variable in
  the read_sep_field() function.
2007-04-07 00:13:27 +04:00
unknown
fa083eb7ab Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-06 20:47:40 +02:00
unknown
e8a8d5df60 Merge acurtis@bk-internal:/home/bk/mysql-5.0-engines
into  xiphis.org:/home/antony/work2/mysql-5.0-engines.merge


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-06 18:07:02 +00:00
unknown
c4baf0925a Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.merge


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-06 17:18:26 +00:00
unknown
c557623a68 Remove a race between Event Scheduler shutdown and SHOW PROCESSLIST.
This will hopefully fix events.test failure on vmware-win32, 
where scheduling is very primitive.


mysql-test/t/events_scheduling.test:
  This test case has no races now and can be enabled under valgrind.
sql/event_scheduler.cc:
  Make Event Scheduler thread shutdown more synchronous: report
  successful shutdown only after having removed the scheduler
  thread from the global list of threads.
  This ensures that after the scheduler has been stopped, its
  thread is not present in SHOW PROCESSLIST output.
2007-04-06 19:44:14 +04:00
unknown
5896976dea Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-runtime
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


mysql-test/r/information_schema.result:
  Auto merged
sql/mysqld.cc:
  Auto merged
2007-04-06 13:53:05 +02:00
unknown
e739ca8743 merging fix
mysql-test/r/type_set.result:
  result fixed
2007-04-06 16:06:10 +05:00
unknown
306be7fee9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  vajra.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/openssl_1.result:
  Manual resolve.
mysql-test/t/openssl_1.test:
  Manual resolve.
2007-04-06 14:15:29 +04:00
unknown
3bed20c39c Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/type_set.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2007-04-06 12:45:07 +05:00
unknown
dd0c20ac28 3d attempt to fix information_schema.test failure on HP-UX.
Apparently it's the only platform in pushbuild where we 
compile without openssl.


mysql-test/r/information_schema.result:
  Update results.
mysql-test/r/openssl_1.result:
  Update results.
mysql-test/t/information_schema.test:
  Move the part of the test case that needs SSL support to 
  openssl_1.test
mysql-test/t/openssl_1.test:
  Add a test case that needs SSL support.
2007-04-06 00:38:57 +04:00
unknown
e3e600bcf1 Add "query_sorted" command to mysqltest
Usage:
  query_sorted <query>;


client/mysqltest.c:
  Add query_sorted command to mysqltest
mysql-test/r/mysqltest.result:
  Update result
mysql-test/t/mysqltest.test:
  Add tests for query_sorted
2007-04-05 20:12:56 +02:00
unknown
923d2d3a01 Remove a dead file.
BitKeeper/deleted/.del-openssl_2.result:
  Delete: mysql-test/r/openssl_2.result
2007-04-05 21:01:09 +04:00
unknown
40e17891da Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  vajra.(none):/opt/local/work/mysql-5.1-c1


sql/mysqld.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
2007-04-05 20:50:28 +04:00
unknown
ff452d050a Post-merge and post-review fixes for the patch for
Bug#23631 "Events: SHOW VARIABLES doesn't work when mysql.event 
is damaged:


mysql-test/r/events.result:
  Update results (a post-merge fix)
mysql-test/r/events_bugs.result:
  Update results (a post-merge fix)
mysql-test/r/events_scheduling.result:
  Update results (a post-merge fix)
mysql-test/t/events_scheduling.test:
  Make sure this test has no races.
sql/event_data_objects.cc:
  Manual post-merge fix for the events replication patch.
sql/event_data_objects.h:
  A post-merge fix.
sql/event_db_repository.cc:
  A post-merge fix.
sql/event_scheduler.cc:
  We should drop the event inside ::execute since there we have
  the right credentials to do so (otherwise Events::drop_event
  returns "access denied" error).
sql/events.cc:
  A post-review fix for: rename start_or_stop_event_scheduler
  to switch_event_scheduler_state.
sql/events.h:
  A post-review fix for: rename start_or_stop_event_scheduler
  to switch_event_scheduler_state.
sql/set_var.cc:
  A post-review fix for: rename start_or_stop_event_scheduler
  to switch_event_scheduler_state.
sql/sql_yacc.yy:
  Remove unused declaratoins.
2007-04-05 20:47:22 +04:00