Commit graph

19411 commits

Author SHA1 Message Date
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  : EXPLAIN SELECT of a subquery is now different


mysql-test/r/subselect2.result:
  Update test result to reflect the fix of Bug  : 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  : 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  : 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
6401b90ddf Add the "test-force" target to "Makefile.am".
Makefile.am:
  Add the "test-force" target, because we use it in RPM building.
  (Backport of Monty's fix from 5.0)
2005-08-23 19:16:43 +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 )


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 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
unknown
5ff24316d9 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 12:10:34 -07:00
unknown
1b970e94e0 Bug#11338 Fixes from review (identical functionality).
include/my_sys.h:
  Fixes from review (use version in log_event.cc instead)
mysql-test/r/ctype_cp932.result:
  Updated test for bug#11338 (logging of prepared statement w/ blob type)
mysql-test/t/ctype_cp932.test:
  udpated test for bug#11338 (logging of prepared statement w/ blob type)
mysys/charset.c:
  Fixes from review (use version in log_event.cc instead)
sql/item.cc:
  Fixes from review (store character_set_client differently so that
  fix can be merged forward to 5.0)
sql/item.h:
  Fixes from review
sql/log_event.cc:
  Fixes from review, str_to_hex is now used by item.cc
sql/log_event.h:
  Added prototype for str_to_hex (now used by item.cc)
sql/sql_prepare.cc:
  Fixes from review, store character_set_client differently so that 
  Item_param::query_val_str can use it.
2005-08-19 14:49:34 -04:00
unknown
01f4258a02 distinct.test, distinct.result:
Added test cases for bug .
sql_select.cc:
  Fixed bug .
  Fixed invalid removal of constant items from the DISTINCT
  list in the function create_distinct_group.


sql/sql_select.cc:
  Fixed bug .
mysql-test/r/distinct.result:
  Added test cases for bug .
mysql-test/t/distinct.test:
  Added test cases for bug .
2005-08-19 01:57:22 -07:00
unknown
91b192142d Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-19 10:13:35 +02:00
unknown
9c668f7f02 ndb -
remove grep from Makefile


ndb/src/kernel/Makefile.am:
  remove grep from Makefile
2005-08-19 10:12:44 +02:00
unknown
83fbcef16a jonas -
Fix checkout properties


BitKeeper/etc/config:
  Fix checkout properties
2005-08-19 09:04:30 +02:00
unknown
8ff3f16df5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-19 07:58:54 +02:00
unknown
678d97ee99 Merge eel.(none):/home/jonas/src/mysql-4.1-push
into  eel.(none):/home/jonas/src/mysql-4.1


mysql-test/t/ndb_config.test:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
2005-08-19 07:51:47 +02:00
unknown
cf312a782d BUG Fixed mispelling
sql/mysqld.cc:
  BUG  Fixed Mispelled 'type'
2005-08-19 07:51:22 +02:00
unknown
af1652d561 ndb
rename config.cpp -> ndb_config.cpp for case insesitive filesystems
why wasn't this done in 4.1 directly


ndb/tools/ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
mysql-test/t/ndb_config.test:
  remove include only present in 5.0
ndb/tools/Makefile.am:
  rename config.cpp -> ndb_config.cpp for case insesitive filesystems
  why wasn't this done in 4.1 directly
2005-08-19 07:48:59 +02:00
unknown
4652c6b053 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication).
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.  


mysql-test/r/rpl_drop_db.result:
  test for query buffer overrun
mysql-test/t/rpl_drop_db.test:
  test for query buffer overrun
sql/mysql_priv.h:
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
BitKeeper/etc/ignore:
  Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
sql/sql_db.cc:
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
sql/sql_table.cc:
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
sql/table.h:
  updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
2005-08-18 21:40:14 -06:00
unknown
13c347e7e7 ps_conv.inc:
Adjustment of float results for Windows
mysql-test-run.pl:
  Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
have_lowercase0.inc:
  new file


mysql-test/mysql-test-run.pl:
  Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
mysql-test/include/ps_conv.inc:
  Adjustment of float results for Windows
2005-08-18 22:27:12 +02:00
unknown
496e86da3a 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


netware/BUILD/nwbootstrap:
  Auto merged
sql/mysqld.cc:
  Auto merged
include/config-netware.h:
  Manual merge from 4.0 to 4.1.
2005-08-18 21:49:46 +03:00
unknown
9b76bca8cf Some minor fixes for Netware. These were required after we started building
against a later version of libc.


include/config-netware.h:
  Changes for Netware. Needed to build against newer libc.
netware/BUILD/nwbootstrap:
  Fix to build script.
sql/mysqld.cc:
  Added an include.
2005-08-18 21:26:25 +03:00
unknown
cd737f81c9 Changes for Netware. This is needed when building against newer Libc
than we've used before.
2005-08-18 21:22:35 +03:00
unknown
4536a103d0 mysqld.dsp:
Added archive and example storage engine to Windows build
ha_example.cc, ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
mysqltest.dsp, mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings


VC++Files/mysql-test/mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings
VC++Files/client/mysqltest.dsp:
  Added /FD flag, to avoid include file warnings
sql/examples/ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
sql/examples/ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
sql/examples/ha_example.cc:
  Windows fix, use relative include path to "mysql_priv.h"
VC++Files/sql/mysqld.dsp:
  Added archive and example storage engine to Windows build
2005-08-18 17:29:24 +02:00
unknown
288c26376b Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-08-19 00:14:43 +10:00
unknown
bdbe25de9b Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push


mysql-test/t/ndb_config.test:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  merge
2005-08-18 14:07:31 +02:00
unknown
c7744c6df5 bug#12118 - ndb alter table data loss
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions


mysql-test/r/ndb_alter_table.result:
  Allow running transactions to use old table definition when possible.
mysql-test/t/ndb_alter_table.test:
  Allow running transactions to use old table definition when possible.
ndb/include/kernel/BlockNumbers.h:
  remove GREP
ndb/include/kernel/GlobalSignalNumbers.h:
  Add ALTER_TABL_REP and API_BROADCAST_REP
ndb/include/kernel/kernel_types.h:
  table_version_major
ndb/include/kernel/signaldata/AlterTable.hpp:
  New error code for alter table during rolling upgrade
ndb/include/ndbapi/NdbDictionary.hpp:
  Add state on table object to represent an altered but still valid table object
ndb/src/common/debugger/BlockNames.cpp:
  remove GREP
ndb/src/common/util/version.c:
  Fix upgrades
ndb/src/kernel/SimBlockList.cpp:
  remove GREP
ndb/src/kernel/blocks/Makefile.am:
  remove GREP
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove GREP
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Split tableSchemaVersion into 2 part
  24 bit real version
   8 bit for online alter table where old table definition is still usable
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Check for same ndb versions
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Update schema printer
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove grep
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  1) Use table_ version_major when checking table version
  2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  1) Use table_ version_major when checking table version
  2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) Use table_ version_major when checking table version
  2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  remove GREP
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/suma/Suma.cpp:
  remove GREP
ndb/src/mgmsrv/MgmtSrvr.cpp:
  remove GREP
ndb/src/ndbapi/DictCache.cpp:
  Add support for alter_table_rep
    by setting status to Altered
  
  NOTE special handling of tables in state RETREIVING
ndb/src/ndbapi/DictCache.hpp:
  Add support for alter_table_rep
    by setting status to Altered
  
  NOTE special handling of tables in state RETREIVING
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Change alter table so that remove from global cache is used wo/ retreiving it from there first
    as ALTER_TABLE_REP might already have changed the table object...
ndb/src/ndbapi/TransporterFacade.cpp:
  Add support for ALTER_TABLE_REP
sql/ha_ndbcluster.cc:
  Allow running transactions to use tables in state ALTERED...but new transactions may not...
ndb/include/kernel/signaldata/ApiBroadcast.hpp:
  New BitKeeper file ``ndb/include/kernel/signaldata/ApiBroadcast.hpp''
2005-08-18 14:02:25 +02:00
unknown
d1bdd18eb4 mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl:
Added suite and test case timeout
mtr_timer.pl:
  new file


mysql-test/lib/mtr_process.pl:
  Added suite and test case timeout
mysql-test/lib/mtr_report.pl:
  Added suite and test case timeout
mysql-test/mysql-test-run.pl:
  Added suite and test case timeout
mysql-test/lib/mtr_timer.pl:
  Added suite and test case timeout
2005-08-18 00:16:44 +02:00