Commit graph

19278 commits

Author SHA1 Message Date
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
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
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
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
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
unknown
2be4560e71 Merge mysql.com:/home/jimw/my/mysql-4.1-12302
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-24 08:50:12 -07:00
unknown
23aecc5cf0 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into  hundin.mysql.fi:/home/heikki/mysql-4.1
2005-08-24 18:07:52 +03:00
unknown
7e03ff1e59 subselect2.result:
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different


mysql-test/r/subselect2.result:
  Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
2005-08-24 18:05:54 +03:00
unknown
6f24ba5f4e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-08-24 16:30:26 +02:00
unknown
891740bff5 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into  hundin.mysql.fi:/home/heikki/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
2005-08-24 17:30:25 +03:00
unknown
4c76d94f2e ha_innodb.cc:
Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain


sql/ha_innodb.cc:
  Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
2005-08-24 17:27:46 +03:00
unknown
ab5cc196e5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


mysys/charset.c:
  Auto merged
2005-08-24 16:13:48 +02:00
unknown
914987906b Merge
mysys/charset.c:
  SCCS merged
2005-08-24 16:11:38 +02:00
unknown
d93563f288 Merge 2005-08-23 18:06:24 +02:00
unknown
43da0a41b4 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


configure.in:
  Auto merged
2005-08-23 14:16:17 +04:00
unknown
a797112c8a removed ndb grep from configure .in
BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
  Delete: ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Delete: ndb/src/kernel/blocks/grep/Grep.cpp
BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
  Delete: ndb/src/kernel/blocks/grep/Makefile.am
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Delete: ndb/src/kernel/blocks/grep/Grep.hpp
BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
  Delete: ndb/src/kernel/blocks/grep/GrepInit.cpp
BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
  Delete: ndb/src/kernel/blocks/grep/systab_test/Makefile
BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
  Delete: ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp
BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
  Delete: ndb/test/ndbapi/testGrep.cpp
2005-08-23 12:16:16 +02:00
unknown
8803c688b5 enabled make of ndb_redo_log_reader 2005-08-23 11:50:24 +02:00
unknown
d40acb4d3f Use the hostname with which the user authenticated when determining which
user to update with 'SET PASSWORD = ...'. (Bug #12302)


mysql-test/r/grant2.result:
  Add new results
mysql-test/t/grant2.test:
  Add new tests
sql/set_var.cc:
  Pass priv_host into check_change_password().
sql/sql_acl.cc:
  Add exact flag for find_acl_user, so we can specify that we want
  an exact match on the hostname.
2005-08-22 15:48:50 -07:00
unknown
28cf62ce14 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 18:24:17 +05:00
unknown
b977af8ace Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/11718-bug-4.1-mysql


sql/sql_select.cc:
  Auto merged
2005-08-22 15:46:14 +04:00
unknown
c50d0fba39 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-22 13:35:00 +02:00
unknown
8fc308b873 Ensure that a failing test does not stop testing or the whole RPM build process. 2005-08-22 12:48:01 +02:00
unknown
e2c29343f8 after pull cleanup
configure.in:
  don't be too restrictive
mysql-test/r/rpl_drop_db.result:
  test case cleanup
mysql-test/t/rpl_drop_db.test:
  test case cleanup
2005-08-22 13:20:02 +04:00
unknown
ce3cc76a51 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.9645
2005-08-22 13:08:44 +05:00
unknown
83ad38ab9f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-21 16:35:27 +02:00
unknown
9df32ec8f8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
2005-08-20 22:33:45 -04:00
unknown
fad7a4ba9b Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-20 16:09:59 -06:00
unknown
ad8c5c9df9 Bug #12460 Table Full
On 64 bit platforms the changed statement doesn't work
so making sure that the larger value is first and using
subtraction is a quick and backwards-compatible fix of this
line.
2005-08-20 10:07:46 -04:00
unknown
a8031724ac Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 15:07:51 -07:00
unknown
ab39c1baf1 Fix ctype_cp932 test to be deterministic on different machines.
mysql-test/r/ctype_cp932.result:
  Update results to make them deterministic
mysql-test/t/ctype_cp932.test:
  Updated test to be deterministic on all machines
2005-08-19 17:55:28 -04:00
unknown
30e9a3ec98 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean


sql/mysqld.cc:
  Auto merged
2005-08-19 23:44:40 +02:00