Commit graph

19591 commits

Author SHA1 Message Date
unknown
20108d6f4b BUG#12542: All set statements should be executed by slave thd
rpl_replicate_do.result:
  New test case
sql_parse.cc:
  All SET statements should be executed by slave thd
rpl_replicate_do.test:
  New test case


mysql-test/t/rpl_replicate_do.test:
  Added test
sql/sql_parse.cc:
  All SET commands should be executed by slave thd
mysql-test/r/rpl_replicate_do.result:
  New test case
2005-08-31 18:08:45 +02:00
unknown
76c1bcf986 BUG#11316: mysqltest, problems when assigning value with '#' to $variable
- Add stricter checking of syntax in mysqltest


client/mysqltest.c:
  Stricter checking of syntax in mysqltest.
mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/create.test:
  Remove extra ;
mysql-test/t/create_select_tmp.test:
  Remove extra ;
mysql-test/t/drop.test:
  Remove extra ;
mysql-test/t/flush.test:
  Remove extra ;
mysql-test/t/handler.test:
  Remove extra ;
mysql-test/t/innodb.test:
  Remove extra ;
mysql-test/t/mysqltest.test:
  Add more tests for replace, replace_columns, comments with commands and sync_with_master
mysql-test/t/rpl000001.test:
  Remove extra ;
mysql-test/t/rpl_EE_error.test:
  Remove extra ;
mysql-test/t/rpl_drop.test:
  Remove extra ;
mysql-test/t/rpl_error_ignored_table.test:
  Remove extra ;
mysql-test/t/rpl_loaddata.test:
  Remove extra ;
2005-08-31 17:16:05 +02:00
unknown
0caa2a61e0 mtr_timer.pl, mtr_report.pl, mtr_process.pl, mysql-test-run.pl:
Backporting from 5.0


mysql-test/mysql-test-run.pl:
  Backporting from 5.0
mysql-test/lib/mtr_process.pl:
  Backporting from 5.0
mysql-test/lib/mtr_report.pl:
  Backporting from 5.0
mysql-test/lib/mtr_timer.pl:
  Backporting from 5.0
2005-08-31 16:28:47 +02:00
unknown
fc45b816f7 Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
1 only if some of it's arguments may be null. When used in subquery in tmp 
table created field which can't be null. When no data retireved result field
have to be set to null and error mentioned in bug report occurs. Also this 
bug can occur if selecting from not null field in empty table.

Function group_concat now marked maybe_null from the very beginning not only
if some of it's argument may be null.


sql/item_sum.cc:
  Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
mysql-test/r/func_gconcat.result:
  Test case for bug #12861 client hang with group_concat insubquery FROM DUAL.
mysql-test/t/func_gconcat.test:
  Test case for bug #12861 client hang with group_concat insubquery FROM DUAL.
2005-08-31 18:26:50 +04:00
unknown
c2252e451f improved error message printing on filesystem refuse signals 2005-08-31 16:15:03 +02:00
unknown
8510e74765 ha_innodb.cc:
Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago


sql/ha_innodb.cc:
  Fix bug #12410 : InnoDB was too permissive with LOCK TABLE ... READ LOCAL, and alowed new inserts to the table; we now make READ LOCAL equivalent to READ for InnoDB; note that this will cause slightly more locking in mysqldump, but makes the InnoDB table dumps consistent with MyISAM table dumps; note that the real code change patch was accidentally pushed with my another patch 5 minutes ago
2005-08-31 14:27:44 +03:00
unknown
138e44b873 ha_innodb.cc:
Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it


sql/ha_innodb.cc:
  Fix bug #12852 : do not increment the open handle count to a table if the table does not have an .ibd file and InnoDB decides to return an error from the ::open() function; then the table can be dropped even if the user has tried to open it
2005-08-31 14:17:05 +03:00
unknown
d0c2e46f11 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 13:10:35 +02:00
unknown
46e57973b8 corrected some erroneous ndb error messages 2005-08-31 13:09:18 +02:00
unknown
4eff41f592 Clone of 4.0.26 is taken, increase version number. 2005-08-31 12:13:22 +02:00
unknown
d02ec2b5d9 Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte one
item_cmpfunc.cc:
  Pass unicode value as "escape" argument to my_wildcmp
  if a multibyte character set is used.
  For single byte character set nothing has changed:
  native (non-unicode) character code is still passed.

ctype_utf8.result, ctype_utf8.test:
  adding test case


sql/item_cmpfunc.cc:
  Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte one
  Pass unicode code instead of native code as
  "escape" argument to my_wildcmp.
mysql-test/t/ctype_utf8.test:
  adding test
mysql-test/r/ctype_utf8.result:
  adding test
2005-08-31 14:04:54 +05:00
unknown
969391784f bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
sql_parse.cc:
mysqld.cc:

  Added --skip-client-character-set-handshake.
  When this option is activated, client side character set
  (which is sent in handshake) is ignored, and server side
  default-character-set value is used for character_set_client
  and character_set_results, thus reprodicing 4.0 behaviour.


sql/mysqld.cc:
  bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  Added --skip-client-character-set-handshake, 
  to reproduce 4.0 behaviour.
sql/sql_parse.cc:
  bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  Added --skip-client-character-set-handshake,
  to reproduce 4.0 behaviour.
2005-08-31 13:03:24 +05:00
unknown
f17853cb85 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 14:36:07 -07:00
unknown
15bea314cc manual merge of bug fix#12537
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  manual merge
2005-08-30 23:29:47 +04:00
unknown
f4491dd772 Merge mysql.com:/home/jimw/my/mysql-4.1-12828
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 12:25:50 -07:00
unknown
ed9ecb0696 Merge mysql.com:/home/jimw/my/mysql-4.1-12757
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-30 12:25:15 -07:00
unknown
aa4820af40 Fix incorrect spellings of "dropped" in source and tests. (Bug #12828)
include/my_alloc.h:
  Fix incorrect spelling
mysql-test/t/rpl000009.test:
  Fix incorrect spelling
mysql-test/t/system_mysql_db_fix.test:
  Fix incorrect spelling
sql/sql_table.cc:
  Fix incorrect spelling
tests/mysql_client_test.c:
  Fix incorrect spelling
2005-08-30 12:24:37 -07:00
unknown
e6ac9175d1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into  zim.(none):/home/brian/mysql/mysql-4.1
2005-08-30 08:28:34 -07:00
unknown
a8a5e98ec6 Fixes bug #5588. vio_was_interrupted() function was added to detect
read timeout properly on win32.


include/my_global.h:
  Added win32 specific socket timeout error code.
include/violite.h:
  Added vio_was_interrupted function that returns true if operation was
  not completed due to timeout.
sql/mini_client.cc:
  added a check that replication read was not completed due to timeout.
sql/net_serv.cc:
  net->last_errno should be equal to ER_NET_READ_INTERRUPTED in case if read
  operation was not completed due to timeout.
vio/vio.c:
  added initialization code for vio_was_interrupted() function.
vio/viosocket.c:
  Added vio_was_interrupted function that returns true if operation was
  not completed due to timeout.
2005-08-30 19:19:28 +04:00
unknown
1a170dc092 Fixes bug #12517. Clear user variables and replication events before
closing temp tables in thread cleanup.


mysql-test/r/connect.result:
  added results for test of bug #12517
mysql-test/t/connect.test:
  added test of bug #12517
sql/sql_class.cc:
  Clear user variables and replication events before
  closing temp tables in thread cleanup.
2005-08-30 17:22:19 +04:00
unknown
2599491a67 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 17:32:53 +05:00
unknown
033faf7256 Fix bug #12537 UNION produces longtext instead of varchar
Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.

Made that functions above take into account max width of character when
converting string fields to blobs.


sql/item.cc:
  Fix bug #12537 UNION produces longtext instead of varchar
  Item::tmp_table_field_from_field_type() now taking into account max char width when creating tmp field for string fields.
sql/sql_select.cc:
  Fix bug #12537 UNION produces longtext instead of varchar
   create_tmp_field_from_item()now taking into account max char width when creating tmp field for string fields.
mysql-test/r/create.result:
  Test case for bug #12537 UNION produces longtext instead of varchar
mysql-test/t/create.test:
  Test case for bug #12537 UNION produces longtext instead of varchar
2005-08-30 16:19:53 +04:00
unknown
bda02a17e7 Bug#12363
character_set_results is nullable, but value_ptr returns string "NULL"

set_var.cc:
  Create Item_null instead of Item_string for NULL values

variables.result, variables.test:
  adding test case


sql/set_var.cc:
  Bug#12363
  character_set_results is nullable, but value_ptr returns string "NULL"
  Create Item_null instead of Item_string for NULL values
mysql-test/t/variables.test:
  fixing tests accordingly
mysql-test/r/variables.result:
  fixing tests accordingly
2005-08-30 17:11:59 +05:00
unknown
52758f7cd8 Bug #12829
Cannot convert the charset of a GROUP_CONCAT result:

item_sum.cc:
  "result" character set was not set into proper value.

func_gconcat.result, func_gconcat.test:
  Fixing tests accordingly.


sql/item_sum.cc:
  Bug #12829
  Cannot convert the charset of a GROUP_CONCAT result:
  "result" character set was not set into proper value.
mysql-test/t/func_gconcat.test:
  Bug #12829
mysql-test/r/func_gconcat.result:
  Bug #12829
2005-08-30 15:36:47 +05:00
unknown
8a06f4ecb9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b9613
2005-08-30 14:23:06 +05:00
unknown
8a1a4996f4 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-08-30 11:09:51 +02:00
unknown
3692f3991d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug12527/my41-bug12527


sql/examples/ha_archive.cc:
  Auto merged
2005-08-30 10:42:41 +02:00
unknown
dcbbffa525 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b9613


sql/set_var.cc:
  Auto merged
2005-08-30 12:33:58 +05:00
unknown
ffcaabe36e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:59:17 +02:00
unknown
d3833a7a01 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:57:30 +02:00
unknown
8b4af60894 bug#12862 - ndb compile error
fix typo


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo
2005-08-30 08:56:46 +02:00
unknown
9a0b0e6dbc Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-08-30 08:17:44 +02:00
unknown
67278665d0 fulltext_var.result:
Update test result.


mysql-test/r/fulltext_var.result:
  Update test result.
2005-08-29 22:35:48 -05:00
unknown
40cfe1e9cd ha_blackhole.cc:
Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!


sql/ha_blackhole.cc:
  Found one more missing DBUG_ENTER. compile-pentium-debug-max does not enable blackhole on 4.1!
2005-08-30 02:46:03 +02:00
unknown
f80f78a0d2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into  zim.(none):/home/brian/mysql/mysql-4.1
2005-08-29 17:41:09 -07:00
unknown
341a08edd3 Added support for delete_all_rows() for archive. This fixes bug #12836.
mysql-test/r/archive.result:
  Update for test case to make sure that TRUNCATE and DELETE function(hah!) as designed.
mysql-test/t/archive.test:
  Add TRUNCATE and DELETE support.
sql/examples/ha_archive.cc:
  Added delete_all_rows() support.
sql/examples/ha_archive.h:
  Added delete_all_rows() support.
sql/handler.h:
  Added flags for fast delete support for archive and federated.
2005-08-29 15:05:16 -07:00
unknown
358c7f336b ha_blackhole.cc:
Added missing DBUG enter, compiled and tested on production with debug-max
  build (my regular build missed the previous errors friday)

Changeset:
 Added missing DBUG_ENTER, compiled and tested on production with debug-max
 build!



sql/ha_blackhole.cc:
  Added missing DBUG enter, compiled and tested on production with debug-max build (my regular build missed the previous errors friday)
  C
2005-08-29 21:22:06 +02:00
unknown
e49ff5ca8d Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-08-29 21:10:25 +02:00
unknown
472b002b75 set_var.cc:
Reorder out-of-order system variables.


sql/set_var.cc:
  Reorder out-of-order system variables.
2005-08-29 12:08:04 -05:00
unknown
36fcc9c637 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
2005-08-29 11:25:12 -05:00
unknown
8d0275b36a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-29 18:25:11 +02:00
unknown
4ce2977b66 updated ndb redo file reader with schemaversion in commit rcord instead of prepare record 2005-08-29 18:23:53 +02:00
unknown
0bf6b94795 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
2005-08-29 10:23:40 -05:00
unknown
ea36375027 Bug#12296 - CHECKSUM TABLE reports 0 for the table
Skipping deleted records instead of breaking the loop
during checksum calculation.


mysql-test/r/myisam.result:
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  The test result.
mysql-test/t/myisam.test:
  Bug#12296 - CHECKSUM TABLE reports 0 for the table
  The test case.
2005-08-29 17:08:41 +02:00
unknown
6318e449e3 Bug#11816 - Truncate table doesn't work with temporary innodb tables
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.


mysql-test/r/innodb.result:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  The test result.
mysql-test/t/innodb.test:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  The test case.
sql/sql_delete.cc:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  Handle temporary tables like permanent tables: If the storage engine
  cannot truncate, delete instead.
  Replaced a numeric literal by its symbolic name.
2005-08-29 17:01:46 +02:00
unknown
0f7161b050 Bug#11493 - Alter table rename to default database does not work without db name qualifying
Supplied the default database name for ALTER TABLE ... RENAME 
for the new table instead of the old tables db like we do for 
other ALTERs.


mysql-test/r/alter_table.result:
  Bug#11493 - Alter table rename to default database does not work without db name qualifying
  The test result.
mysql-test/t/alter_table.test:
  Bug#11493 - Alter table rename to default database does not work without db name qualifying
  The test case.
2005-08-29 16:54:33 +02:00
unknown
f876fae9c8 Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188.


mysql-test/r/key.result:
  Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
  The test result.
mysql-test/t/key.test:
  Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
  The test case.
2005-08-29 16:50:09 +02:00
unknown
922e7582ea Bug #12527 yassl causes errors in "repair" and "optimize"
- Use constant directly to check that enough number of bytes have been written as header of the archive.


sql/examples/ha_archive.cc:
  Don't take "sizeof" the constant DATA_BUFFER_SIZE. Simply use DATA_BUFFER_SIZE as is.
2005-08-29 14:04:15 +02:00
unknown
593f03d94b ctype_utf8.result, ctype_utf8.test, item.cc:
Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.


sql/item.cc:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
mysql-test/t/ctype_utf8.test:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
mysql-test/r/ctype_utf8.result:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
2005-08-29 16:49:01 +05:00
unknown
527a9cad7e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12371


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
2005-08-29 15:44:49 +05:00