19558 Commits

Author SHA1 Message Date
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
unknown
8dd3a7d9a7 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-08-28 20:03:03 +02:00
unknown
f658a7a7c3 Makefile.am:
Make ports configurable from environment for test


Makefile.am:
  Make ports configurable from environment for test
2005-08-28 19:46:56 +02:00
unknown
c0b511eab0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2005-08-27 22:00:22 -05:00
unknown
ee4db475ec Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-08-27 21:52:26 -05:00
unknown
fefb444caf mysqld.cc:
Reorder out-of-order status variables.


sql/mysqld.cc:
  Reorder out-of-order status variables.
2005-08-27 21:04:58 -05:00
unknown
5aa1b53f80 set_var.cc:
Reorder out-of-order system variables.


sql/set_var.cc:
  Reorder out-of-order system variables.
2005-08-27 21:02:05 -05:00
unknown
d7ff622e8d set_var.cc:
Reorder out-of-order system variables.


sql/set_var.cc:
  Reorder out-of-order system variables.
2005-08-27 19:20:10 -05:00
unknown
52e3c0a2b5 mysqld.cc:
Reorder out-of-order status variables.


sql/mysqld.cc:
  Reorder out-of-order status variables.
2005-08-27 19:18:53 -05:00
unknown
56b8fc52cf Merge deer.(none):/home/hf/work/mysql-4.1.9645
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-27 18:06:09 +05:00
unknown
809ea163b0 typo to DBUG_RETURN fixed
sql/ha_blackhole.cc:
  Typo to DBUG_RETURN fixed
2005-08-26 20:29:26 +02:00
unknown
a8dbdbe927 workaround (bug #9613: Some read-only variables are selectable, others are not).
sql/set_var.cc:
  workaround (bug #9613: Some read-only variables are selectable, others are not).
  sys_have_innodb variable added.
2005-08-26 13:23:32 +05:00
unknown
7b8ab0e1cf Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  radha.local:/Users/patg/mysql-build/mysql-4.1
2005-08-26 03:14:56 +02:00
unknown
586dda71ff ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878, per brian
sql/ha_blackhole.cc:
  Blackhole Lock changes to blackhole per Brian, reapplied
sql/ha_blackhole.h:
  blackhold lock changes added per brian
2005-08-26 02:09:56 +02:00
unknown
8ec12a8686 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 23:24:16 +03:00
unknown
6c555e7db5 Fix crash in DES_DECRYPT(NULL). (Bug #12757)
sql/item_strfunc.cc:
  Don't call res->length() when res may be NULL because args[0] is a NULL.
2005-08-25 12:34:42 -07:00
unknown
fc5aff7119 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-25 13:37:55 +02:00
unknown
7fafb009e2 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-25 13:34:20 +02:00
unknown
58e57625c4 bug#12027 - ndb
When detecting corrupt schema file.
  Make sure to close it (as it will be opened later when rewriting a clean copy)


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bug#12027 
    When detecting corrupt schema file.
    Make sure to close it (as it will be opened later when rewriting a clean copy)
2005-08-25 13:16:29 +02:00
unknown
4b59ede9c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-25 13:05:32 +02:00
unknown
685c9a0578 config:
changed tomas default checkout


BitKeeper/etc/config:
  changed tomas default checkout
2005-08-25 13:04:53 +02:00
unknown
b7f1fb08f0 Merge mysql.com:/M41/push-4.1 into mysql.com:/M41/mysql-4.1 2005-08-25 11:22:16 +02:00
unknown
00b9916aff Correct a typing error: Missing ".pl" suffix is essential. 2005-08-25 11:17:54 +02:00
unknown
ea09b97036 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysqlcheck.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
client/client_priv.h:
  Merged from 4.0.
client/mysql.cc:
  Merged from 4.0.
client/mysqladmin.cc:
  Merged from 4.0.
client/mysqlbinlog.cc:
  Merged from 4.0.
client/mysqldump.c:
  Merged from 4.0.
client/mysqlshow.c:
  Merged from 4.0.
myisam/myisamchk.c:
  Merged from 4.0.
myisam/myisampack.c:
  Merged from 4.0.
netware/mysql_test_run.c:
  Merged from 4.0.
netware/mysqld_safe.c:
  Merged from 4.0.
sql/mysqld.cc:
  Merged from 4.0.
2005-08-25 12:08:26 +03:00
unknown
a3277cff1a Add back changes lost in merge
(Faster test)


mysql-test/t/rpl_drop_db.test:
  Add back changes lost in merge
2005-08-25 10:19:06 +03:00
unknown
b91b8235bb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1
2005-08-25 09:39:09 +03:00
unknown
0f75276353 Remove function that was accidently added back 2005-08-25 09:03:41 +03:00
unknown
9e796abb5b merged 2005-08-25 00:08:02 +04:00
unknown
961abf79ab memroot: trash the memory in free_root() 2005-08-24 23:07:06 +04:00
unknown
97dbe8dbe3 Several fixes for Netware.
client/client_priv.h:
  Added option auto close for Netware.
client/mysql.cc:
  Added option auto close for Netware.
client/mysqladmin.c:
  Added option auto close for Netware.
client/mysqlbinlog.cc:
  Added option auto close for Netware.
client/mysqlcheck.c:
  Added option auto close for Netware.
client/mysqldump.c:
  Added option auto close for Netware.
client/mysqlimport.c:
  Added option auto close for Netware.
client/mysqlshow.c:
  Added option auto close for Netware.
client/mysqltest.c:
  Fixed help messages for Netware.
extra/my_print_defaults.c:
  Fixed help messages for Netware.
extra/perror.c:
  Fixed help messages for Netware.
extra/resolve_stack_dump.c:
  Fixed help messages for Netware.
include/help_end.h:
  Fixed help messages for Netware.
include/help_start.h:
  Fixed help messages for Netware.
isam/isamchk.c:
  Added auto close of window for Netware
isam/pack_isam.c:
  Added auto close of window for Netware
myisam/myisamchk.c:
  Added auto close of window for Netware
myisam/myisamlog.c:
  Added help for Netware.
myisam/myisampack.c:
  Added auto close for Netware.
netware/myisamchk.def:
  Scrollable screen patch.
netware/mysql.def:
  Scrollable screen patch.
netware/mysql_test_run.c:
  Fixed strindex for Netware.
netware/mysqladmin.def:
  Scrollable screen patch.
netware/mysqlbinlog.def:
  Scrollable screen patch.
netware/mysqlcheck.def:
  Scrollable screen patch.
netware/mysqld_safe.c:
  Removed debug message for Netware.
netware/mysqldump.def:
  Scrollable screen patch.
netware/mysqlimport.def:
  Scrollable screen patch.
netware/mysqlshow.def:
  Scrollable screen patch.
sql/mysqld.cc:
  Abnormal end patch when shutting down and volume not ready.
2005-08-24 22:03:34 +03:00
unknown
e0f9b8a807 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1
2005-08-24 20:55:54 +03:00
unknown
9171169e80 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.local:/home/my/mysql-4.1
2005-08-24 19:53:40 +03:00
unknown
7b39b01b9a Review fixes
mysql-test/r/ctype_cp932.result:
  Remove first event to make things portable
mysql-test/r/rpl_drop_db.result:
  Use 'mysqltest' as database instead of 'd1'
  Made test faster by using longer table names instead of lots of tables
mysql-test/t/ctype_cp932.test:
  Remove first event to make things portable
mysql-test/t/rpl_drop_db.test:
  Use 'mysqltest' as database instead of 'd1'
  Made test faster by using longer table names instead of lots of tables
sql/sql_db.cc:
  Indentation & style fixes
  Simple optimization (remove constant and boolean variable)
2005-08-24 19:37:27 +03:00