- 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
-
- 05 Feb, 2005 11 commits
-
-
unknown authored
mysql-test/r/drop_temp_table.result: result update
-
unknown authored
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged configure.in: Auto merged include/mysql.h: Auto merged scripts/Makefile.am: Auto merged mysql-test/r/drop_temp_table.result: SCCS merged sql/sql_base.cc: SCCS merged
-
unknown authored
mysql-test/r/type_date.result: Update results
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean sql/item_func.cc: Auto merged
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-outer-joins-cleanup sql/mysql_priv.h: Auto merged sql/table.h: Auto merged
-
unknown authored
Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments). sql/mysql_priv.h: Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only. sql/opt_range.cc: Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only. sql/sql_base.cc: Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only. sql/sql_select.cc: Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only. sql/table.h: Outer joins cleanup: * Remove TABLE::outer_join and use TABLE::maybe_null only. * Added comments.
-
unknown authored
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
-
unknown authored
-
unknown authored
into mysql.com:/home/mysql_src/mysql-4.1-clean
-
unknown authored
into mysql.com:/home/my/mysql-5.0
-
unknown authored
Cleanup during reviews of new pushed code BUILD/compile-pentium-debug-max: Use --debug=full as default BUILD/compile-pentium-debug: Use --debug=full as default mysys/my_alloc.c: More debugging sql/item_func.cc: Cleanup new code Don't call insert_id() for last_insert_id(value) to avoid side effects sql/item_subselect.cc: Fixed DBUG output sql/sp_head.cc: Simple cleanup sql/sql_lex.cc: Moved usage of arguments first in lex_start to make their usage clearer Remove sl->expr_list.deleete_elements() becasue: - It didn't do anything (delete_elements on a list of list is a no-op operation) - The deleted for loop used SELECT_LEX elements that was allocated in mysql_new_select() in sp-head, but freed when sphead->mem_root was freed. (delete sphead doesn't remove used SELECT_LEX elements from the global all_selects_list) sql/sql_parse.cc: More DBUG entries
-
- 04 Feb, 2005 28 commits
-
-
unknown authored
into mysql.com:/home/psergey/mysql-4.1-bug7816
-
unknown authored
into mysql.com:/home/psergey/mysql-5.0-bug7716 sql/item_cmpfunc.cc: Auto merged sql/sql_string.h: Auto merged
-
unknown authored
CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when we use the bundled zlib. acinclude.m4: Extend MYSQL_CHECK_ZLIB_WITH_COMPRESS m4 macro to substitute ZLIB_DEPS - this is a special version of ZLIB_LIBS to use in mysql_config configure.in: Remove NON_THREADED_CLIENT_LIBS which weren't really NON_THREADED_CLIENT_LIBS and use NON_THREADED_LIBS instead. AC_SUBST NON_THREADED_LIBS and STATIC_NSS_FLAGS as they're now needed inside mysql_config.sh scripts/Makefile.am: Add STATIC_NSS_FLAGS, NON_THREADED_LIBS and ZLIB_DEPS to sed substitution list. scripts/mysql_config.sh: We can't use CLIENT_LIBS as in case when we use the bundled zlib it has a reference to $(top_builddir)/zlib. libs and libs_r now need to be specified explicitly. zlib/Makefile.am: Install libz.la in case it's used by MySQL: this way we guarantee that paths printed by mysql_config are valid in all cases.
-
unknown authored
Proposal to fix this problem: when using libmysqlclient, you must call mysql_server_end() to nicely free memory at the end of your program; it however sounds weird to call a function named *SERVER_end* when you're the CLIENT (you're not ending the server, you're ending your ability to talk to servers). So here I add two defines which should be more generic names. Our manual mentions these functions only for libmysqld API so needs some fixing, and then we can close BUG#8099 and BUG#6149. include/mysql.h: Creating synonyms (defines): mysql_library_init for mysql_server_init, mysql_library_end for mysql_server_end; these new names are more generic, so suitable when using libmysqlclient as well as libmysqld.
-
unknown authored
when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*. mysql-test/r/drop_temp_table.result: result update (note: one DROP TEMPORARY TABLE per tmp table) mysql-test/t/drop_temp_table.test: checking that we have one DROP TEMPORARY TABLE per tmp table now, not one multi-table DROP. Hiding columns Log_pos/End_log_pos per Monty's request. sql/sql_base.cc: When we close the session's temp tables at session end, we automatically write to binlog one DROP TEMPORARY TABLE per tmp table, not one single multi-table DROP TEMPORARY TABLE (because it causes problems if slave has --replicate*table rules).
-
unknown authored
mysql-test/r/func_group.result: Update results
-
unknown authored
-
unknown authored
client/mysqlcheck.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/ft_static.c: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/union.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisam.h: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/sql_union.cc: Auto merged sql/field.cc: Clean up merge
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean sql/field.cc: Auto merged
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
into mysql.com:/home/mysqldev/tulin/mysql-4.1
-
unknown authored
-
unknown authored
into mysql.com:/home/mysqldev/tulin/mysql-5.0 BitKeeper/etc/logging_ok: auto-union sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
USE_RUNNING_SERVER should be set to 0 or 1 mysql-test/mysql-test-run.sh: USE_RUNNING_SERVER should be set to 0 or 1
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
-
unknown authored
mysql-test/r/insert_select.result.es: Test.es fixed
-
unknown authored
into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/item_func.cc: Auto merged
-
unknown authored
ftbw->off wasn't cleared on reinit - Bug#8234 include/ft_global.h: get rid of default_charset_info in indexless fulltext searches myisam/ft_boolean_search.c: get rid of default_charset_info in indexless fulltext searches clear ftbw->off on reinits myisam/ft_static.c: get rid of default_charset_info in indexless fulltext searches myisam/ftdefs.h: get rid of default_charset_info in indexless fulltext searches sql/ha_myisam.h: get rid of default_charset_info in indexless fulltext searches sql/handler.h: get rid of default_charset_info in indexless fulltext searches sql/item_func.cc: get rid of default_charset_info in indexless fulltext searches
-
unknown authored
into hundin.mysql.fi:/home/marko/mysql-5.0
-
unknown authored
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra BitKeeper/etc/logging_ok: auto-union sql/ha_innodb.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged
-
unknown authored
sql/ha_ndbcluster.cc: Fixing spaces in parameter list.
-
unknown authored
innobase/page/page0cur.c: Remove two duplicate rec_get_offsets() calls
-
unknown authored
fixed change in struct in 4.1->5.0 merge sql/ha_ndbcluster.cc: fixed change in struct in 4.1->5.0 merge
-
unknown authored
into mysql.com:/home/mysqldev/tulin/mysql-4.1
-
unknown authored
into mysql.com:/home/mysqldev/tulin/mysql-5.0
-
unknown authored
BitKeeper/etc/logging_ok: auto-union sql/sql_yacc.yy: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
-