summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-4.1-12302unknown2005-08-2426-3481/+313
|\ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean
| * Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-241-1/+1
| |\ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.1
| | * subselect2.result:unknown2005-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-241-1/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1
| | * Merge hundin.mysql.fi:/home/heikki/mysql-4.0unknown2005-08-241-1/+25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.1 sql/ha_innodb.cc: Auto merged
| | | * ha_innodb.cc:unknown2005-08-241-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-240-0/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/mysql-4.1 mysys/charset.c: Auto merged
| | * | Mergeunknown2005-08-240-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | mysys/charset.c: SCCS merged
| * | \ \ Mergeunknown2005-08-2313-43/+279
| |\ \ \ \
| | * | | | ps_conv.inc:unknown2005-08-183-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | mysqld.dsp:unknown2005-08-186-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | mtr_timer.pl, mysql-test-run.pl, mtr_report.pl, mtr_process.pl:unknown2005-08-184-5/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | mtr_process.pl:unknown2005-08-181-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#11792: Create a shell like 'mysqltest' exit status mysql-test/lib/mtr_process.pl: Bug#11792: Create a shell like 'mysqltest' exit status
| | * | | | mtr_process.pl:unknown2005-08-171-4/+10
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Longer shutdown timeout, slave may be in reconnect HUP seem to disturb exit(), added sleep to make sure output is flushed mysql-test/lib/mtr_process.pl: Longer shutdown timeout, slave may be in reconnect HUP seem to disturb exit(), added sleep to make sure output is flushed
| | * | | No C++ style comments in C source!unknown2005-08-171-1/+1
| | | | |
| * | | | removed ndb grep from configure .inunknown2005-08-239-3432/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | enabled make of ndb_redo_log_readerunknown2005-08-232-4/+8
| | | | |
* | | | | Use the hostname with which the user authenticated when determining whichunknown2005-08-224-9/+87
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-222-1/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/11718-bug-4.1-mysql sql/sql_select.cc: Auto merged
| * | | | Fix bug #11718 query with function, join and order by returns wrong type.unknown2005-08-172-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create_tmp_field_from_item() was creating tmp field without regard to original field type of Item. This results in wrong type being reported to client. To create_tmp_field_from_item() added special handling for Items with DATE/TIME field types to preserve their type. sql/sql_select.cc: Fix bug #11718 query with function, join and order by returns wrong type. tests/mysql_client_test.c: Test case for bug #11718: query with function, join and order by returns wrong type
* | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-221-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-4.1-push
| * | | | Ensure that a failing test does not stop testing or the whole RPM build process.unknown2005-08-221-2/+2
| | | | |
* | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-2122-43/+1316
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-4.1-push
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-202-6/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
| | * | | | Fix ctype_cp932 test to be deterministic on different machines.unknown2005-08-192-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-208-5/+1200
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into asksasha.com:/reiser-data/mysql-dev/mysql-4.1
| | * | | | | updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication). unknown2005-08-187-48/+1085
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * | | | | Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-177-7/+165
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into asksasha.com:/reiser-data/mysql-dev/mysql-4.1 sql/mysql_priv.h: Auto merged
| | | * | | | | patch for BUG#4680 - drop database breaking replication if there were extra ↵unknown2005-08-035-7/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files in the database directory on the master mysql-test/r/rpl_drop_db.result: New BitKeeper file ``mysql-test/r/rpl_drop_db.result'' mysql-test/t/rpl_drop_db.test: New BitKeeper file ``mysql-test/t/rpl_drop_db.test''
| | | * | | | | The earlier commit for BUG#10456 did not add the test fileunknown2005-08-021-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/rpl_insert_select.test: New BitKeeper file ``mysql-test/t/rpl_insert_select.test''
| | | * | | | | Added a test case for BUG#10456unknown2005-08-021-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/rpl_insert_select.result: New BitKeeper file ``mysql-test/r/rpl_insert_select.result''
| * | | | | | | Bug #12460 Table Fullunknown2005-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-08-191-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | * \ \ \ \ \ \ Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-191-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into radha.local:/Users/patg/mysql-build/mysql-4.1.clean sql/mysqld.cc: Auto merged
| | | * | | | | | BUG #12498 Fixed mispellingunknown2005-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/mysqld.cc: BUG #12498 Fixed Mispelled 'type'
| * | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1unknown2005-08-199-33/+51
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | * | | | | | | Bug#11338 Fixes from review (identical functionality).unknown2005-08-199-33/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | distinct.test, distinct.result:unknown2005-08-193-3/+58
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test cases for bug #12625. sql_select.cc: Fixed bug #12625. Fixed invalid removal of constant items from the DISTINCT list in the function create_distinct_group. sql/sql_select.cc: Fixed bug #12625. mysql-test/r/distinct.result: Added test cases for bug #12625. mysql-test/t/distinct.test: Added test cases for bug #12625.
* | | | | | | | Merge eel.(none):/home/jonas/src/mysql-4.1unknown2005-08-192-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-4.1-push
| * | | | | | | | ndb -unknown2005-08-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove grep from Makefile ndb/src/kernel/Makefile.am: remove grep from Makefile
| * | | | | | | | jonas - unknown2005-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix checkout properties BitKeeper/etc/config: Fix checkout properties
* | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-08-1931-124/+338
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-4.1-push
| * | | | | | | Merge eel.(none):/home/jonas/src/mysql-4.1-pushunknown2005-08-191-1/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | ndb unknown2005-08-193-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Merge eel.(none):/home/jonas/src/mysql-4.1unknown2005-08-1832-124/+339
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | bug#12118 - ndb alter table data loss unknown2005-08-1831-124/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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''
| | * | | | | | | ndb - only run ndb_config test when using "default" configunknown2005-07-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/ndb_config.test: only run ndb_config test when using "default" config
* | | | | | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-08-180-0/+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.
| * | | | | | | | Some minor fixes for Netware. These were required after we started buildingunknown2005-08-183-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | Merge mysql.com:/space/my/mysql-4.0unknown2005-08-124-7/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.0-merge