Commit graph

51124 commits

Author SHA1 Message Date
unknown
c6f076f64a Merge polly.(none):/home/kaa/src/opt/bug9481/my51-bug9481
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2007-11-30 18:49:29 +03:00
unknown
f904aab43e Merge polly.(none):/home/kaa/src/opt/bug9481/my50-bug9481
into  polly.(none):/home/kaa/src/opt/bug9481/my51-bug9481


sql/sql_class.h:
  Null merge.
sql/sql_insert.cc:
  Null merge.
tests/mysql_client_test.c:
  Null merge.
2007-11-30 18:27:00 +03:00
unknown
ff7e7fcb67 Bug#32775 problems with SHOW EVENTS and Information_Schema
removed unnecessary privilege checks for I_S schema


mysql-test/r/information_schema.result:
  test result
mysql-test/t/information_schema.test:
  test case
sql/events.cc:
  There is no events in I_S so we don't need to execute check_access here.
sql/sql_parse.cc:
  removed unnecessary check
2007-11-30 18:48:22 +04:00
unknown
f4a7464f1e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/psergey/mysql-5.1-bug32772
2007-11-28 22:43:52 +03:00
unknown
b9d8e34925 Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
added new func mysql_create_like_schema_frm() which creates frm file based on I_S table


mysql-test/r/create.result:
  test result
mysql-test/t/create.test:
  test case
sql/sql_table.cc:
  added new func mysql_create_like_schema_frm() which creates frm file based on I_S table
2007-11-28 15:37:00 +04:00
unknown
b5c0cf454d BUG#32772: partition crash 1: enum column
The bug was that for ordered index scans, ha_partition::index_init() did
not put index columns into table->read_set if the underlying storage 
engine did not have HA_PARTIAL_COLUMN_READ flag. 
This was causing assertion failure when handle_ordered_index_scan() tried
to sort the records according to index order.

Fixed by making ha_partition::index_init() put index columns into table->read_set
for all ordered scans. 


mysql-test/r/partition.result:
  BUG#32772: partition crash 1: enum column
  - Testcase
mysql-test/t/partition.test:
  BUG#32772: partition crash 1: enum column
  - Testcase
sql/ha_partition.cc:
  BUG#32772: partition crash 1: enum column
  - Make ha_partition::index_init() include index columns in the read_set
    whenever an ordered scan is initialized, no matter if
    HA_PARTIAL_COLUMN_READ is set or not.
2007-11-28 03:02:05 +03:00
unknown
9d503cea20 Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B30355-5.1-opt


include/mysql_com.h:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/udf_example.c:
  Auto merged
2007-11-27 17:19:51 +02:00
unknown
63b6516953 Bug #30355: Incorrect ordering of UDF results
There's currently no way of knowing the determinicity of an UDF.
And the optimizer and the sequence() UDFs were making wrong
assumptions about what the is_const member means.
Plus there was no implementation of update_system_tables()
causing the optimizer to overwrite the information returned by
the <udf>_init function.

Fixed by equating the assumptions about the semantics of 
is_const and providing a implementation of update_used_tables().
Added a TODO item for the UDF API change needed to make a better 
implementation.


include/mysql_com.h:
  Bug #30355: comment added
mysql-test/r/udf.result:
  Bug #30355: test case
mysql-test/t/udf.test:
  Bug #30355: test case
sql/item_func.cc:
  Bug #30355: keep const_item_cache and used_tables_cache in sync
sql/item_func.h:
  Bug #30355: 
   - a better implementation of update_used_tables()
   - keep const_item_cache and used_tables_cache in sync
sql/udf_example.c:
  Bug #30355: Wrong value for const_item fixed.
2007-11-27 17:16:52 +02:00
unknown
3058e02573 Many files:
Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.


mysql-test/r/subselect.result:
  Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
mysql-test/r/subselect_notembedded.result:
  Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
mysql-test/t/subselect.test:
  Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
mysql-test/t/subselect_notembedded.test:
  Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
2007-11-26 22:21:46 +03:00
unknown
8ae8b2e5ef Merge polly.(none):/home/kaa/src/opt/bug28837/my51-bug29131
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


storage/myisam/ha_myisam.cc:
  Auto merged
mysql-test/r/merge.result:
  Manual merge.
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/merge.test:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
2007-11-26 20:15:30 +03:00
unknown
ed48025916 Merge polly.(none):/home/kaa/src/opt/bug28837/my50-bug29131
into  polly.(none):/home/kaa/src/opt/bug28837/my51-bug29131


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
storage/myisam/ha_myisam.cc:
  Manual merge.
storage/myisammrg/ha_myisammrg.cc:
  Manual merge.
2007-11-26 20:02:04 +03:00
unknown
67bf39f241 Fix for bug #28837: MyISAM storage engine error (134) doing delete with
self-join

When doing DELETE with self-join on a MyISAM or MERGE table, it could
happen that a record being retrieved in join_read_next_same() has
already been deleted by previous iterations. That caused the engine's
index_next_same() method to fail with HA_ERR_RECORD_DELETED error and
the whole DELETE query to be aborted with an error.

Fixed by suppressing the HA_ERR_RECORD_DELETED error in
hy_myisam::index_next_same() and ha_myisammrg::index_next_same(). Since
HA_ERR_RECORD_DELETED can only be returned by MyISAM, there is no point
in filtering this error in the SQL layer.


mysql-test/r/merge.result:
  Added a test case for bug #28837.
mysql-test/r/myisam.result:
  Added a test case for bug #28837.
mysql-test/t/merge.test:
  Added a test case for bug #28837.
mysql-test/t/myisam.test:
  Added a test case for bug #28837.
sql/ha_myisam.cc:
  Skip HA_ERR_RECORD_DELETED silently when calling mi_rnext_same().
sql/ha_myisammrg.cc:
  Skip HA_ERR_RECORD_DELETED silently when calling mi_rnext_same().
2007-11-26 18:58:54 +03:00
unknown
1836b73600 5.0 version of the fix for bug #9481: mysql_insert_id() returns 0 after
insert ... select.

The 5.0 manual page for mysql_insert_id() does not mention anything
about INSERT ... SELECT, though its current behavior is incosistent
with what the manual says about the plain INSERT.

Fixed by changing the AUTO_INCREMENT and mysql_insert_id() handling
logic in INSERT ... SELECT to be consistent with the INSERT behavior,
the manual, and the changes in 5.1 introduced by WL3146:


- mysql_insert_id() now returns the first automatically generated
AUTO_INCREMENT value that was successfully inserted by INSERT ... SELECT

-  if an INSERT ... SELECT statement is executed, and no automatically
generated value is successfully inserted, mysql_insert_id() now returns
the ID of the last inserted row.


sql/sql_class.h:
  Replaced last_insert_id with autoinc_value_of_last_inserted_row to be
  consistent with 5.1 code.
sql/sql_insert.cc:
  Revised the AUTO_INCREMENT and mysql_insert_id() handling logic in
  INSERT ... SELECT to be consistent with INSERT behavior, the manual, and
  changes in 5.1 introduced by WL3146:
  
  - mysql_insert_id() now returns the first automatically generated
  AUTO_INCREMENT value that was successfully inserted;
  
  -  if an INSERT ... SELECT statement is executed, and no automatically
  generated value is successfully inserted, mysql_insert_id() now returns
  the ID of the last inserted row.
tests/mysql_client_test.c:
  Backported the test cases related to INSERT ... SELECT and
  mysql_insert_id() from WL3146 patch to 5.0.
2007-11-26 18:36:05 +03:00
unknown
185b9efe8c merge of 5.0-opt to 5.1-opt 2007-11-26 16:06:46 +02:00
unknown
6b4a0f2595 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B32036-5.1-opt
2007-11-26 16:02:32 +02:00
unknown
b7a2960fee Merge magare.gmz:/home/kgeorge/mysql/work/B32036-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B32036-5.1-opt


mysql-test/r/subselect.result:
  merged fix for bug 32036 to 5.1-opt
mysql-test/t/subselect.test:
  merged fix for bug 32036 to 5.1-opt
sql/sql_yacc.yy:
  merged fix for bug 32036 to 5.1-opt
2007-11-26 13:48:22 +02:00
unknown
f3f9855d13 Bug #32036: EXISTS within a WHERE clause with a UNION
crashes MySQL 5.122
There was a difference in how UNIONs are handled
on top level and when in sub-query.
Because the rules for sub-queries were syntactically
allowing cases that are not currently supported by
the server we had crashes (this bug) or wrong results
(bug 32051).
Fixed by making the syntax rules for UNIONs match the 
ones at top level.

These rules however do not support nesting UNIONs, e.g.
(SELECT a FROM t1 UNION ALL SELECT b FROM t2) 
 UNION
(SELECT c FROM t3 UNION ALL SELECT d FROM t4)
Supports for statements with nested UNIONs will be
added in a future version.


mysql-test/r/subselect.result:
  Bug #32036: test case
mysql-test/t/subselect.test:
  Bug #32036: test case
sql/sql_yacc.yy:
  Bug #32036: Make the syntax rules for UNIONs in subqueries the same
  as for top level UNIONs.
2007-11-26 13:36:24 +02:00
unknown
9eb12eb945 Merge magare.gmz:/home/kgeorge/mysql/work/B32268-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B32268-5.1-opt


mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-11-26 13:33:36 +02:00
unknown
aab5779bca Bug#30152 MySQLD crash duing alter table causes DROP DATABASE to FAIL due to temp file(addon)
result fix


mysql-test/r/drop.result:
  result fix
2007-11-26 12:56:31 +04:00
unknown
6969f6cf8c Merge mysql.com:/home/hf/work/30284/my50-30284
into  mysql.com:/home/hf/work/30284/my51-30284


mysql-test/r/gis.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2007-11-24 15:06:06 +04:00
unknown
d5ab58861b Merge mysql.com:/home/hf/work/30284/my41-30284
into  mysql.com:/home/hf/work/30284/my50-30284


mysql-test/r/gis.result:
  merging
mysql-test/t/gis.test:
  merging
2007-11-24 15:05:24 +04:00
unknown
c58de28410 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/30284/my50-30284


mysql-test/r/gis.result:
  merging
mysql-test/t/gis.test:
  merging
2007-11-24 15:02:29 +04:00
unknown
11bd8594c2 Merge bk@192.168.21.1:mysql-5.1-opt
into  mysql.com:/home/hf/work/30284/my51-30284


mysql-test/r/gis.result:
  merging
mysql-test/t/gis.test:
  merging
2007-11-24 15:02:23 +04:00
unknown
6facf554bd Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/30284/my41-30284


mysql-test/r/gis.result:
  merging
mysql-test/t/gis.test:
  merging
2007-11-24 14:59:48 +04:00
unknown
ff5120f0fe Merge mysql.com:/home/hf/work/30284/my50-30284
into  mysql.com:/home/hf/work/30284/my51-30284


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
2007-11-24 14:57:51 +04:00
unknown
e4dc9a8e6e merging fix
mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  test fixed
2007-11-24 14:57:09 +04:00
unknown
d04f74b775 Merge mysql.com:/home/hf/work/30284/my41-30284
into  mysql.com:/home/hf/work/30284/my50-30284


myisam/mi_check.c:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/r/gis.result:
  SCCS merged
2007-11-24 14:47:32 +04:00
unknown
5668c1b39b Merge polly.(none):/home/kaa/src/opt/bug29976/my51-bug28550
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


sql/slave.cc:
  Auto merged
2007-11-23 18:16:41 +03:00
unknown
86823d74b1 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-11-23 18:21:55 +04:00
unknown
9a34c80e11 Bug#30152 MySQLD crash duing alter table causes DROP DATABASE to FAIL due to temp file
disable decoding of table name if the table is internal temporary table


mysql-test/r/drop.result:
  test result
mysql-test/t/drop.test:
  test case
sql/sql_db.cc:
  check is the name is internal tmp table name
sql/sql_table.cc:
  disable decoding of table name if the table is internal temporary table
sql/table.h:
  added flag which is true when table name is the name of internal temporary table
2007-11-23 18:21:24 +04:00
unknown
10c1aa796a Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B32400-5.0-opt


tests/mysql_client_test.c:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged
2007-11-23 15:30:16 +02:00
unknown
8401d59585 Merge bk-internal:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/work/B32400-5.1-opt
2007-11-23 15:26:53 +02:00
unknown
042a58e049 Merge magare.gmz:/home/kgeorge/mysql/work/B32400-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/B32400-5.1-opt


BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
sql/item.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/subselect.test:
  merge of bug 32400 to 5.1-opt
2007-11-23 14:41:47 +02:00
unknown
13f637fbf2 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-11-23 16:27:33 +04:00
unknown
6b3fed49ea Bug#32178 server crash when select from i_s and concurrent partition management
The crash happens because we change share->partition_info where 'share' is global struct
(it affects other threads which use the same 'share').
It causes discrepancy between 'share' and handler data. 
The fix:
Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.


sql/sql_partition.cc:
  fast_end_partition: added close_thread_tables() for the case when error occures
  fast_alter_partition_table: added close_thread_tables() for the case when error occures
sql/sql_table.cc:
  The crash happens because we change share->partition_info where 'share' is global struct.
  It causes discrepancy between 'share' and handler data.
  The fix:
  Move share->partition_info update into WFRM_INSTALL_SHADOW part which is protected by OPEN_lock.
2007-11-23 16:27:05 +04:00
unknown
d1a414591f Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-11-23 15:23:54 +03:00
unknown
7ba06230a7 Merge polly.(none):/home/kaa/src/opt/bug32080/my51-bug26215
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


mysql-test/lib/mtr_report.pl:
  Auto merged
2007-11-23 14:59:56 +03:00
unknown
339e8f5d63 merge 5.0-opt -> 5.1-opt 2007-11-23 13:40:53 +02:00
unknown
c00bfc3bee Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt


mysql-test/r/gis.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/type_bit.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/subselect.result:
  null merge. resolve latete.
mysql-test/t/subselect.test:
  merge 5.0-opt -> 5.1-opt
sql/key.cc:
  merge 5.0-opt -> 5.1-opt
sql/sql_class.h:
  merge 5.0-opt -> 5.1-opt
sql/sql_insert.cc:
  merge 5.0-opt -> 5.1-opt
sql/sql_table.cc:
  merge 5.0-opt -> 5.1-opt
2007-11-23 12:26:19 +02:00
unknown
e7501cd9bc Fix for bug #32080: Excessive warnings on Solaris: setrlimit could not
change the size of core files.

Suppress the 'setrlimit could not change the size of the core files'
warning in mysql-test-run. We do not want core files on some of the
PushBuild hosts, and PushBuild itself does not set --core-files, so
that warning is expected.


mysql-test/lib/mtr_report.pl:
  Suppress the 'setrlimit could not change the size of the core files'
  warning in mysql-test-run. We do not want core files on some of the
  PushBuild machines, and PushBuild itself does not set --core-files, so
  that warning is expected.
2007-11-23 13:13:37 +03:00
unknown
a197c4e95d opt_range.cc:
Fix for the bug#31048 for 64bit platforms.
subselect.test, subselect.result:
  Corrected text case for the bug#31048.


mysql-test/t/subselect.test:
  Corrected text case for the bug#31048.
mysql-test/r/subselect.result:
  Corrected text case for the bug#31048.
sql/opt_range.cc:
  Fix for the bug#31048 for 64bit platforms.
2007-11-23 00:16:17 +03:00
unknown
0270449126 Merge gleb.loc:/work/bk/PA/5.0-opt-32556
into  gleb.loc:/work/bk/5.0-opt
2007-11-22 22:03:36 +04:00
unknown
67522fcb9f Fix for bug #29976: Excessive Slave I/O errors in replication tests
Problem:

The "Slave I/O thread couldn't register on master" error sporadically
occurred in replication tests because the slave I/O thread got
killed by STOP SLAVE before or while registering on master.

Fixed by checking the state of the I/O thread, and issueing
the error only if it was not explicitely killed by a user.


sql/slave.cc:
  When the slave I/O thread fails to register on master, issue an error
  message only if it is not explicitely killed by a user with STOP SLAVE.
2007-11-22 19:22:54 +03:00
unknown
a44d52b8f4 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31171-5.1-opt
2007-11-22 17:35:02 +02:00
unknown
1fde17d4e0 Merge polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-11-22 17:26:10 +03:00
unknown
3d550b757d Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-11-22 17:24:08 +03:00
unknown
109015fc6d Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445
into  polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445


scripts/make_win_bin_dist:
  Manual merge.
2007-11-22 17:17:32 +03:00
unknown
ae5ec36bcb Fixed build failures on Windows introduced by the patch for bug #32221.
We do not have any executables in libmysql/release/ anymore.
2007-11-22 17:13:12 +03:00
unknown
37fbdb585b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B31171-5.1-opt
2007-11-22 15:32:08 +02:00
unknown
bac4f3e6ee Merge polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt


tests/mysql_client_test.c:
  Auto merged
2007-11-22 14:56:01 +03:00