- 19 Jul, 2006 2 commits
-
-
unknown authored
Post merge changes.
-
unknown authored
into govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2 mysql-test/r/federated.result: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" hand merge mysql-test/t/federated.test: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" hand merge sql/ha_federated.cc: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" hand merge
-
- 18 Jul, 2006 1 commit
-
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.0-17608 include/my_base.h: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/t/merge.test: Auto merged sql/ha_myisammrg.cc: Auto merged sql/handler.cc: Auto merged
-
- 17 Jul, 2006 1 commit
-
-
unknown authored
Removed logic in ha_federated::write_row, which checks field query ids in the loop which builds the query to run on the remote server. mysql-test/r/federated.result: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" New test results for test that verifies that one can insert to rows using "insert into... select * from..", delete them by id, then immediately insert them in the same way they were originally inserted. mysql-test/t/federated.test: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" New test that verifies that one can insert to rows using "insert into... select * from..", delete them by id, then immediately insert them in the same way they were originally inserted. sql/ha_federated.cc: "BUG #18764: Delete conditions causing inconsistencies in Federated tables" Removed the logic in ha_federated::write_row which checked the query id of each field and compared it to the thread query id. Each field has a query id, and the problem used to be that if I did an insert no fields specified, the field value would contain the last inserted value for that field. The way to work around this was to see if the query id for that field was the same as the current query id or of the rest of the field query ids. If it wasn't, that told me the query didn't have the field value specified. Somewhere from when I wrote that code to now the problem went away, and there was no longer the need for this logic. Also removed the bool "has_fields", which needs not exist and using table->s->fields is sufficient.
-
- 12 Jul, 2006 5 commits
-
-
unknown authored
The Federated storage engine used Field methods that had arbitrary limits on the amount of data they could process, which caused problems with data over that limit (4K). By removing those Field methods and just using features of the String class, we can avoid this problem. mysql-test/r/federated.result: Add new results mysql-test/t/federated.test: Add new regression test sql/field.cc: Remove unnecessary methods sql/field.h: Remove unnecessary methods sql/ha_federated.cc: Remove use of quote_data, use String::print() to get escaping of strings, and don't bother with needs_quotes, just always quote values.
-
unknown authored
sql/item_timefunc.cc: Fix a valgrind warning in type_date test.
-
unknown authored
into dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl ndb/include/kernel/GlobalSignalNumbers.h: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/ndbapi/ndberror.c: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged
-
unknown authored
into rama.(none):/home/jimw/my/mysql-5.0-17766
-
unknown authored
Changed the error reporting (and a crash) when inserting data into a MERGE table that has no underlying tables or no INSERT_METHOD specified by reporting that it is read-only. include/my_base.h: Add new handler error mysql-test/r/merge.result: Update results mysql-test/t/merge.test: Add new regression test sql/ha_myisammrg.cc: When trying to insert into a MERGE table with no underlying tables or no INSERT_METHOD, report that it is read-only. sql/handler.cc: Handle new error message
-
- 11 Jul, 2006 6 commits
-
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 sql/sql_table.cc: Auto merged
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-amerge sql/handler.h: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
-
unknown authored
into trift2.:/M50/mysql-5.0
-
unknown authored
into dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge ndb/include/kernel/GlobalSignalNumbers.h: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/ndbapi/ndberror.c: Auto merged
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 sql/opt_range.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/Makefile.am: Manual merge.
-
- 10 Jul, 2006 21 commits
-
-
unknown authored
sql/sql_locale.cc: "true" -> TRUE
-
unknown authored
into trift2.:/M50/mysql-5.0 configure.in: Auto merged
-
unknown authored
-
unknown authored
sql/sql_locale.cc: Fix Windows compilation failure "cannot convert from 'const char [6]' to 'const BOOL'" and an apparent bug (use of "FALSE" instead of FALSE for initialization of is_ascii member of MY_LOCALE)
-
unknown authored
-
unknown authored
into gbichot3.local:/home/mysql_src/mysql-5.0
-
unknown authored
mysql-test/r/myisam.result: Fix test results. mysql-test/t/myisam.test: In 5.0 show create table also outputs data directory. For the test for Bug#8706 it's MYSQLTEST_VARDIR, and there is no way to replace it with anything else in test output.
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2 ndb/include/kernel/GlobalSignalNumbers.h: Auto merged ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged ndb/test/run-test/daily-basic-tests.txt: Auto merged
-
unknown authored
ndb/src/kernel/blocks/dbdict/DictLock.txt: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/src/kernel/blocks/dbdih/Dbdih.hpp: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/src/kernel/vm/SimulatedBlock.cpp: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/src/kernel/vm/SimulatedBlock.hpp: wait until SL_STARTED before sending DICT_UNLOCK_ORD ndb/test/run-test/daily-basic-tests.txt: wait until SL_STARTED before sending DICT_UNLOCK_ORD
-
unknown authored
ndb/include/kernel/GlobalSignalNumbers.h: 5.0 : add NODE_START_REP from 5.1 ndb/src/common/debugger/signaldata/SignalNames.cpp: 5.0 : add NODE_START_REP from 5.1 ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: 5.0 : add NODE_START_REP from 5.1 ndb/src/kernel/vm/SimulatedBlock.cpp: 5.0 : add NODE_START_REP from 5.1 ndb/src/kernel/vm/SimulatedBlock.hpp: 5.0 : add NODE_START_REP from 5.1
-
unknown authored
fails" mysql-test/t/myisam.test: Fix myisam.test to work with non-default mysqltest var directory.
-
unknown authored
VC++Files/libmysqld/libmysqld.dsp: Add sql_locale.cpp VC++Files/libmysqld/libmysqld.vcproj: Add sql_locale.cpp VC++Files/sql/mysqld.dsp: Add sql_locale.cpp VC++Files/sql/mysqld.vcproj: Add sql_locale.cpp
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
-
unknown authored
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: non-debug compile fix
-
unknown authored
into dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog sql/sql_base.cc: Manual merge
-
unknown authored
into trift2.:/M50/mysql-5.0
-
unknown authored
support-files/mysql.spec.sh: Fix a typing error in the "make" target for the Perl script to run the tests.
-
unknown authored
into trift2.:/M50/back23-5.0 support-files/mysql.spec.sh: Auto merged
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
-
unknown authored
mysql-test/Makefile.am: fix cp of mode 444 files
-
unknown authored
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
-
- 09 Jul, 2006 2 commits
-
-
unknown authored
closing temp tables through end_thread had a flaw in binlog-off branch of close_temporary_tables where next table to close was reset via table->next for (table= thd->temporary_tables; table; table= table->next) which was wrong since the current table instance got destoyed at close_temporary(table, 1); The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying. sql/sql_base.cc: no-binlog branch is fixed: scanning across temporary_tables must be careful to save next table since the current is being destroyed inside of close_temporary. binlog-is-open case is ok.
-
unknown authored
between pointer to function and pointer to object. sql/item_func.cc: Use typedef names instead of hard-coded types for udf init/deinit functions. sql/sql_udf.cc: Use typedef names for udf function types.
-
- 08 Jul, 2006 2 commits
-
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41 myisam/mi_create.c: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_trigger.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/federated.result: Manual merge. mysql-test/t/federated.test: Manual merge.
-
unknown authored
into chilla.local:/home/mydev/mysql-5.0-amerge
-