An error occurred fetching the project authors.
- 19 Jul, 2006 1 commit
-
-
unknown authored
Post merge changes.
-
- 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 1 commit
-
-
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.
-
- 01 Jul, 2006 1 commit
-
-
unknown authored
NDB table". SQL-layer was not marking fields which were used in triggers as such. As result these fields were not always properly retrieved/stored by handler layer. So one might got wrong values or lost changes in triggers for NDB, Federated and possibly InnoDB tables. This fix solves the problem by marking fields used in triggers appropriately. Also this patch contains the following cleanup of ha_ndbcluster code: We no longer rely on reading LEX::sql_command value in handler in order to determine if we can enable optimization which allows us to handle REPLACE statement in more efficient way by doing replaces directly in write_row() method without reporting error to SQL-layer. Instead we rely on SQL-layer informing us whether this optimization applicable by calling handler::extra() method with HA_EXTRA_WRITE_CAN_REPLACE flag. As result we no longer apply this optimzation in cases when it should not be used (e.g. if we have on delete triggers on table) and use in some additional cases when it is applicable (e.g. for LOAD DATA REPLACE). Finally this patch includes fix for bug#20728 "REPLACE does not work correctly for NDB table with PK and unique index". This was yet another problem which was caused by improper field mark-up. During row replacement fields which weren't explicity used in REPLACE statement were not marked as fields to be saved (updated) so they have retained values from old row version. The fix is to mark all table fields as set for REPLACE statement. Note that in 5.1 we already solve this problem by notifying handler that it should save values from all fields only in case when real replacement happens. include/my_base.h: Added HA_EXTRA_WRITE_CAN_REPLACE, HA_EXTRA_WRITE_CANNOT_REPLACE - new parameters for ha_extra() method. We use them to inform handler that write_row() which tries to insert new row into the table and encounters some already existing row with same primary/unique key can replace old row with new row instead of reporting error. mysql-test/r/federated.result: Additional test for bug#18437 "Wrong values inserted with a before update trigger on NDB table". mysql-test/r/ndb_replace.result: Added test for bug #20728 "REPLACE does not work correctly for NDB table with PK and unique index". Updated wrong results from older test. mysql-test/t/federated.test: Additional test for bug#18437 "Wrong values inserted with a before update trigger on NDB table". mysql-test/t/ndb_replace.test: Added test for bug #20728 "REPLACE does not work correctly for NDB table with PK and unique index". sql/ha_ndbcluster.cc: We no longer rely on reading LEX::sql_command value in handler in order to determine if we can enable optimization which allows us to handle REPLACE statement in more efficient way by doing replaces directly in write_row() method without reporting error to SQL-layer. Instead we rely on SQL-layer informing us whether this optimization applicable by calling handler::extra() method with HA_EXTRA_WRITE_CAN_REPLACE flag. As result we no longer apply this optimization in cases when it should not be used (e.g. if we have on delete triggers on table) and use in some additional cases when it is applicable (e.g. for LOAD DATA REPLACE). sql/item.cc: Item_trigger_field::setup_field(): Added comment explaining why we don't set Field::query_id in this method. sql/mysql_priv.h: mysql_alter_table() function no longer takes handle_duplicates argument. Added declaration of mark_fields_used_by_triggers_for_insert_stmt() function. sql/sql_delete.cc: Mark fields which are used by ON DELETE triggers so handler will retrieve values for these fields. sql/sql_insert.cc: Explicitly inform handler that we are doing REPLACE (using ha_extra() method) in cases when it can promote insert operation done by write_row() to replace. Also when we do REPLACE we want to store values for all columns so we should inform handler about it. Finally we should mark fields used by ON UPDATE/ON DELETE triggers as such so handler can properly retrieve/restore values in these fields during execution of REPLACE and INSERT ... ON DUPLICATE KEY UPDATE statements. sql/sql_load.cc: Explicitly inform handler that we are doing LOAD DATA REPLACE (using ha_extra() method) in cases when it can promote insert operation done by write_row() to replace. Also when we do replace we want to save (replace) values for all columns so we should inform handler about it. Finally to properly execute LOAD DATA for table with triggers we should mark fields used by ON INSERT triggers as such so handler can properly store values for these fields. sql/sql_parse.cc: mysql_alter_table() function no longer takes handle_duplicates argument. sql/sql_table.cc: Got rid of handle_duplicates argument in mysql_alter_table() and copy_data_between_tables() functions. These functions were always called with handle_duplicates == DUP_ERROR and thus contained dead (and probably incorrect) code. sql/sql_trigger.cc: Added Table_triggers_list::mark_fields_used() method which is used to mark fields read/set by triggers as such so handlers will be able properly retrieve/store values in these fields. sql/sql_trigger.h: Table_triggers_list: Added mark_fields_used() method which is used to mark fields read/set by triggers as such so handlers will be able properly retrieve/store values in these fields. To implement this method added 'trigger_fields' member which is array of lists linking items for all fields used in triggers grouped by event and action time. sql/sql_update.cc: Mark fields which are used by ON UPDATE triggers so handler will retrieve and save values for these fields. mysql-test/r/ndb_trigger.result: Added test for bug#18437 "Wrong values inserted with a before update trigger on NDB table". mysql-test/t/ndb_trigger.test: Added test for bug#18437 "Wrong values inserted with a before update trigger on NDB table".
-
- 29 Jun, 2006 4 commits
-
-
unknown authored
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT". mysql-test/r/federated.result: Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT". mysql-test/t/federated.test: Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
-
unknown authored
-
unknown authored
mysql-test/t/federated.test: Use --replace_result to make test work on non-standard ports. mysql-test/r/federated.result: Use --replace_result to make test work on non-standard ports.
-
unknown authored
mysql-test/t/federated.test: Use --replace_result to make test work on non-standard ports. mysql-test/r/federated.result: Use --replace_result to make test work on non-standard ports.
-
- 28 Jun, 2006 2 commits
-
-
unknown authored
Pushbuild fixes to result file, test, and header file for federated. mysql-test/r/federated.result: BUG #19773 Pushbuild fixes - result file had hard-coded port mysql-test/t/federated.test: BUG #19773 Pushbuild fixes Test was missing --replace_result sql/ha_federated.h: BUG #19773 HPUX and Windows failed with variable named row and *row in method declaration
-
unknown authored
Final-review fixes per Monty, pre-push. OK'd for push. Please see each file's comments. mysql-test/r/federated.result: BUG #19773 Results for multi-table deletes, updates mysql-test/t/federated.test: BUG #19773 Test multi table update and delete. Added drop table to end of previous test. sql/ha_federated.cc: BUG #19773 Post-review changes, per Monty. 3rd patch, OK'd for push. - Added index_read_idx_with_result_set, which uses the result set passed to it - Hash by entire connection scheme - Protected store_result result set for table scan by adding a method result set to index_read_idx and index_read which is passed to index_read_with_result, which in turn iterates over the single record via read_next. This is a change from having two result sets in the first two patches. This keeps the code clean and avoids the need for yet another result set. - Rewrote ::position and ::rnd_pos to store position - if primary key use primary key, if not, use record buffer. - Rewrote get_share to store hash with connect string vs. table name - delete_row added subtration of "records" by affected->rows - Added read_next to handle what rnd_next used to do (converting raw record to query and vice versa) - Removed many DBUG_PRINT lines - Removed memset initialisation since subsequent loop accomplishes - Removed un-necessary mysql_free_result lines sql/ha_federated.h: BUG #19773 Fixed "SET " to " SET " to make sure built statements are built with "UPDATE `t1` SET .." instead of "UPDATE `t1`SET"
-
- 26 Jun, 2006 1 commit
-
-
unknown authored
When building the UPDATE query to send to the remote server, the federated storage engine built the query incorrectly if it was updating a field to be NULL. Thanks to Bjrn Steinbrink for an initial patch for the problem. mysql-test/r/federated.result: Add new results mysql-test/t/federated.test: Add new regression test sql/ha_federated.cc: Fix logic of how fields are added to SET and WHERE clauses of an UPDATE statement. Fields that were NULL were being handled incorrectly. Also reorganizes the code a little bit so the update of the two clauses is consistent.
-
- 28 Feb, 2006 1 commit
-
-
unknown authored
- Always make rnd_pos reposition the cursor in the fetched result set. mysql-test/r/federated.result: Update test result mysql-test/t/federated.test: Add test for bug#17377 sql/ha_federated.cc: Remove the "scan_flag" variable. rnd_pos should always move to a new position in the result set. The "scan" flag in rnd_init will protect from the old result set being closed and a new fecthed. I think the "scan_flag" was added before check of the "scan" argument in rnd_init was added. sql/ha_federated.h: Remove class variable "scan_flag"
-
- 31 Jan, 2006 1 commit
-
-
unknown authored
mysql-test/t/federated.test: Fix missing --replace_result on $SLAVE_MYPORT to work with MTR_BUILD_THREAD. mysql-test/r/federated.result: Fix missing --replace_result on $SLAVE_MYPORT to work with MTR_BUILD_THREAD.
-
- 27 Jan, 2006 1 commit
-
-
unknown authored
Added fixes to make last_insert_id() to work. mysql-test/r/federated.result: BUG #14768 New test results for last_insert_id() mysql-test/t/federated.test: BUG #14768 Tests for last_insert_id() sql/ha_federated.cc: BUG# 14768 * Added code to set last_insert_id() * Added code to free share->scheme sql/ha_federated.h: BUG #14768 New method for setting last_insert_id()
-
- 01 Nov, 2005 2 commits
-
-
unknown authored
Post-review fixes mysql-test/r/federated.result: BUG# 14532 Regenerated test results mysql-test/t/federated.test: BUG# 14532 Added comments to test
-
unknown authored
Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns work. mysql-test/r/federated.result: BUG# 14532 Test fix by creating table with bit column and inserting,selecting mysql-test/t/federated.test: BUG# 14532 Test fix by creating table with bit column and inserting,selecting sql/field.cc: BUG #14532 Just needed to quote/escape bit field, add FIELD_TYPE_BIT to switch
-
- 13 Oct, 2005 1 commit
-
-
unknown authored
new file mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. Many files: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. Adding true BINARY/VARBINARY: new pad_char structure member. ctype-bin.c: Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. field.cc: Adding true BINARY/VARBINARY. sql/field.cc: Adding true BINARY/VARBINARY. strings/ctype-big5.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-bin.c: Adding true BINARY/VARBINARY: new pad_char structure member. New strnxfrm, with two trailing length bytes. strings/ctype-cp932.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-czech.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-euc_kr.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-eucjpms.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-extra.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-gb2312.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-gbk.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-latin1.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-simple.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-sjis.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-tis620.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-uca.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-ucs2.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-ujis.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-utf8.c: Adding true BINARY/VARBINARY: new pad_char structure member. strings/ctype-win1250ch.c: Adding true BINARY/VARBINARY: new pad_char structure member. include/m_ctype.h: Adding true BINARY/VARBINARY: new pad_char structure member. mysql-test/t/alter_table.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/binary.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/cast.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ctype_cp1251.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ctype_many.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/federated.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/func_in.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ndb_condition_pushdown.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/ndb_types.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/sp.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/t/type_blob.test: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/alter_table.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/binary.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/cast.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ctype_cp1251.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ctype_many.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/federated.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/func_in.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ndb_condition_pushdown.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/ndb_types.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/sp.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/system_mysql_db.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. mysql-test/r/type_blob.result: Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes. scripts/mysql_create_system_tables.sh: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding. scripts/mysql_fix_privilege_tables.sql: Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
-
- 12 Oct, 2005 1 commit
-
-
unknown authored
(problem found by kent) mysql-test/r/federated.result: replace port number with a named identifier mysql-test/t/federated.test: add call to replace the resulting display of the port number with a string
-
- 11 Oct, 2005 1 commit
-
-
unknown authored
mysql-test/r/federated.result: test results for SHOW CREATE TABLE mysql-test/t/federated.test: added test for SHOW CREATE TABLE sql/sql_show.cc: added connect_string for SHOW CREATE TABLE
-
- 30 Sep, 2005 1 commit
-
-
unknown authored
BUG#13108 mysql-test/r/federated.result: added test results for federated alter table mysql-test/t/federated.test: added test for federated alter table sql/examples/ha_example.cc: supports table re-creation sql/examples/ha_tina.cc: supports table re-creation sql/ha_blackhole.cc: supports table re-creation sql/ha_federated.cc: added flag for not supporting alter sql/ha_heap.cc: supports table recreation sql/ha_myisam.cc: supports table recreation sql/ha_myisammrg.cc: supports table re-creation sql/handler.cc: implemented flag check function sql/handler.h: added additional handlerton flags created a function to test flags replace ha_supports_generate macro with call to flag check sql/sql_delete.cc: replaced ha_supports_generate with handlerton flag check sql/sql_table.cc: added check for handlerton check for alter support
-
- 13 Sep, 2005 1 commit
-
-
unknown authored
(per Monty's patch). Remove references to the "COMMENT" field. WL#2414 mysql-test/r/federated.result: alter from "COMMENT=" to "CONNECTION=" mysql-test/r/federated_archive.result: change "COMMENT=" to "CONNECTION=" mysql-test/t/federated.test: change from "COMMENT=" to "CONNECTION=" mysql-test/t/federated_archive.test: change from "COMMENT=" to "CONNECTION=" sql/ha_federated.cc: Change parsing of char* table->s->comment to LEX_STRING table->s->connect_string (per Monty's patch) sql/handler.h: added LEX_STRING "connection_string" (per Monty's patch) sql/sql_yacc.yy: added setting of "connect_string" string and length sql/table.cc: Modifying frm file to store connecting information (code change came from Monty). sql/table.h: added connect_string sql/unireg.cc: Storing information on connection_string (code came from Monty).
-
- 19 Jul, 2005 1 commit
-
-
unknown authored
as well as changes to the test. mysql-test/r/federated.result: New test results mysql-test/t/federated.test: Removed explains per brian's suggestion since on his 64-bit amd, you get different information, something to be ironed out later, as well as it having nothing to do with federated. sql/ha_federated.cc: - Eric Herman's implementation of repair and optimize!!! - Eric's changes to 1EQ0 to FALSE sql/ha_federated.h: Eric's addition of LEN for each SQL string tokens.
-
- 16 Jul, 2005 1 commit
-
-
unknown authored
deallocation cleanup mysql-test/r/federated.result: new test results mysql-test/t/federated.test: New tests, and added explains per Timour's suggestion. This will keep track of whether changes have been made to the optimiser that might affect Federated. Also changed the error codes to federated error codes in the error tests sql/ha_federated.cc: 1. Not using MAX_REMOTE_SIZE, so removed 2. Changed all defines that were IO_SIZE to FEDERATED_QUERY_BUFFER_SIZE 3. Now using Federated Error Codes 4. Implemented ::info (gets valid 'records' number) 5. Implemented ::read_range_first - now uses indexes in range operations 6. Better allocation in get_share 7. Cleaned up memory bug in get_share 8. Better initial query "SELECT * FROM t1 WHERE 1=0" for check_foreign_data_src 9. emit_key_part_name and emit_key_part_element for read_range_first to not have redundancy 10. Made sure all 'append's pass length, and use append("") to ensure proper null termination of strings being built. 11. Better message creation. If ER_QUERY_ON_FOREIGN_DATA_SRC, I also pass the actual error code and message from the foreign data src. 12. Cleaned up how the result set and share->scheme is freed. sql/share/errmsg.txt: New Federated error messages that are more tailored to the type of information we want to see when federated has an error. mysql-test/include/federated.inc: New bitkeeper file, include file for separating setup from main test suite mysql-test/include/federated_cleanup.inc: New BitKeeper file ``mysql-test/include/federated_cleanup.inc'' sql/ha_federated.h: Added comments where needed, one was already commented about
-
- 27 May, 2005 1 commit
-
-
unknown authored
mysql-test/r/federated.result: added explain results to join test results per Timour's request. mysql-test/t/federated.test: Added explain to test per Timour's request sql/ha_federated.cc: better comment to explain why we need table->status set to 0
-
- 25 May, 2005 1 commit
-
-
unknown authored
changes to fix joins not working (bug #10848). New tests, as well as table->status being set in index_read_idx mysql-test/r/federated.result: new join test results mysql-test/t/federated.test: new simple join tests (more to come with subsequent commits) sql/ha_federated.cc: This fixes joins not working. Monty discussed that having to deal with table->status needs to be moved from the handler/storage engine to a higher level BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-
- 21 Mar, 2005 1 commit
-
-
unknown authored
mysql-test/r/federated.result: made sure result has SLAVE_PORT! mysql-test/t/federated.test: added --replace_result to a table creation that I forgot to add before
-
- 16 Mar, 2005 1 commit
-
-
unknown authored
Changes to a test with a update to a table with 1001 columns, the last being a blob. On HP, the test worked properly, but on other OSs, there's a problem with using the blob column in an update where clause. The field method val_string(String *, char *) should work, but doesn't seem to deal with blobd, and for some reason, cannot get the correct value of the blob column from the byte pointer in update_row, "*old_data" which is a byte pointer to the row in mysql format, that will be replaced with "*new_data" (which conveniently has a field pointer to use to get values from). Will document this. mysql-test/r/federated.result: New test results. These results have been tested on production and hpita2 successfully. mysql-test/t/federated.test: Changed blob column in this test due to some issues with HPUX handling it correctly and other OSs not. Will document this (blobs in update where clause)
-
- 15 Mar, 2005 1 commit
-
-
unknown authored
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully tested on both my own workstation (Suse 9.0) and production.mysql.com. mysql-test/r/federated.result: new test results for error handling tests. mysql-test/t/federated.test: new error handling tests sql/ha_federated.cc: - check_foreign_data source added - table names now enclosed in '`' to allow for '%' or other characters - better error handling - mysql_init now checked to see if it returns true/false, error out if false (Georg) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-
- 23 Feb, 2005 1 commit
-
-
unknown authored
Patch #2, all coding style changes per Kostja's review (as requested to keep style changes separate from functionality changes), as well as changes to the test suit to no longer use hard-coded port values in foreign table creation statement mysql-test/r/federated.result: Now using SLAVE_PORT as opposed to hard-coded port value mysql-test/t/federated.test: - changed test to use SLAVE_MYPORT - made all standard SQL uppercase - made test 80 cols, except blob inserts of text sql/ha_federated.cc: - made sure all comments and style changes were according to Kostja's review - combined parse_url error handling into a 'error:' block, took out triple exclamation points. - clarified commented documentation - got rid of all trailing spaces
-
- 06 Feb, 2005 1 commit
-
-
unknown authored
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by making available via removal of static in method definition and declaration in mysql.h, but Konstantin had some reservations, but he said to commit the patch using this anyway, and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple fixes to my code as well as formatting changes, and I thought it would just be easier to hand-edit my changes into a fresh clone and then make a patch. The reason for using cli_fetch_lengths is so that I can correctly get the length of the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this won't correctly get the length of binary data and is also less effecient. Upon testing, it was in fact verified that binary data in a blob table was being inserted correctly, but not being retrieved correctly, all due to not having the correct value for the field: (*field)->store(row[x], strlen(row[x]), &my_charset_bin); was changed to: (*field)->store(row[x], lengths[x], &my_charset_bin); lengths being a unsigned long pointer to the values of the field lengths from a MYSQL_ROW. Since the server doesn't have the function "mysql_fetch_lengths" available, I tried to use "result->lengths", but this isn't set, so I finally successfully used cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets retrieved correctly. I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting! This code passes the entire test suite, without any errors or warning on both my workstation and build.mysql.com include/mysql.h: added cli_fetch_lengths to mysql.h in order to use this function in the federated handler mysql-test/r/federated.result: - Moved countries to be created and inserted prior to federated test table - Added a test of inserting binary values into a blob table mysql-test/t/federated.test: - Moved order of countries table creation to prior to test table creation - Test insertion of binary values in a blob table sql-common/client.c: removed 'static' to allow cli_fetch_lengths to be used in the federated handler sql/ha_federated.cc: 1. share->scheme that was created in parse_url was not being freed 2. HASH federated_open_tables was being deleted, but not freed 3. 'result' from mysql_store_result was not being free in several instances 4. Fixed the problem where a table scan was being performed after index_read_idx, which didn't cause a problem because the result set from idx_read_idx was not being freed, but once the result set was properly freed, it broke update_row. Now, I'm using the bool 'scan' to determine if I need to perform a table scan, which it magically is false when the query is an update with an index. 5. Changed all stings containing the query to perform in mysql_real_query calls from string.c_ptr_quick() to string.ptr() per Monty's suggestion (better performance) 6. Fixed various cast/type/truth compile warnings. 7. Removed 'load_conn_info' and just let 'parse_url' handle it. 8. Added the use of cli_fetch_lengths, needed to fix binary values being retrieved from the database in rnd_next/convert_row_to_internal_format 9. Formatting changes by using indent-ex! sql/ha_federated.h: added scan flag, setting defaults for result and scan_flag
-
- 21 Jan, 2005 1 commit
-
-
unknown authored
-New tests and results logging_ok: Logging to logging@openlogging.org accepted ha_federated.h: removed quote_data and type_quote (now in the Field class) ha_federated.cc: moved quote_data and type_quote to field class field.h: new methods quote_data and needs_quotes declared field.cc: new field class methods quote_data and needs_quotes (per Monty's request) federated.test: more tests, joins, index tests have_federated_db.require: new name of federated system var federated.result: new test results for federated handler have_federated_db.inc: changed name of variable in test due to change in vars sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler ha_federated.cc: implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions. sql/mysql_priv.h: define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler sql/sql_analyse.cc: over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler. mysql-test/include/have_federated_db.inc: changed name of variable in test due to change in vars mysql-test/r/federated.result: new test results for federated handler mysql-test/r/have_federated_db.require: new name of federated system var mysql-test/t/federated.test: more tests, joins, index tests sql/field.cc: new field class methods quote_data and needs_quotes (per Monty's request) sql/field.h: new methods quote_data and needs_quotes declared sql/ha_federated.cc: moved quote_data and type_quote to field class sql/ha_federated.h: removed quote_data and type_quote (now in the Field class) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-
- 17 Dec, 2004 1 commit
-
-
unknown authored
mysql-test/r/federated.result: new test results mysql-test/t/federated.test: added order by, group by sql/ha_federated.cc: - added 'scheme' to URL - added proper escaping - made sure &my_charset_bin is being used throughout handler - made sure create_table catches improper URL in comment upon table creation sql/ha_federated.h: added scheme to share
-
- 11 Dec, 2004 1 commit
-
-
unknown authored
First commit to mysql-5.0 tree to include MySQL Federated Storage Handler. This includes both the source and header files, test (results, test, require), and modifications to server and handler base files, and autoconf modifications to properly build federated handler. configure.in: inclusion of federated handler autoheader macro mysql-test/mysql-test-run.sh: allow usage of replication tests for federated handler sql/Makefile.am: inclusion of federated header and source file sql/field.h: overloaded method val_str() to work with fields in 'old_data' in 'update_row()' sql/handler.cc: added code to include federated handler sql/handler.h: add db type for federated sql/mysql_priv.h: added code for federated handler sql/mysqld.cc: added code for federated handler sql/set_var.cc: added code for federated handler
-