summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Collapse)AuthorAgeFilesLines
* libmysql_r/client_settings.h libmysqld/ha_blackhole.ccunknown2007-08-291-0/+0
| | | | | | | | | | Deleted BitKeeper soft links not needed BitKeeper/deleted/.del-client_settings.h: Delete: libmysql_r/client_settings.h BitKeeper/deleted/.del-ha_blackhole.cc: Delete: libmysqld/ha_blackhole.cc
* libmysqld.def:unknown2007-06-121-2/+2
| | | | | | | | Corrected name of mysql_thread_{init,end} (bug#29007) libmysqld/libmysqld.def: Corrected name of mysql_thread_{init,end} (bug#29007)
* Add a cast, needed by some platforms.unknown2007-06-081-1/+1
| | | | | | | | | Still part of the fix for bug#27078. libmysqld/lib_sql.cc: Some platforms need a cast. Still part of the fix for bug#27078.
* Do not use the "thd" pointer to identify a thread in the embedded lib,unknown2007-06-071-1/+1
| | | | | | | | | | | | | | | but rather use the "thread_id" counter. Fixes bug#27078: Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision libmysqld/lib_sql.cc: Avoid casting a pointer to a (possibly) int, which will not compile on some platforms: Do not use the "thd" pointer to identify a thread in the embedded lib, but rather use the "thread_id" counter. Patch is proposed by Monty. Fixes bug#27078.
* bug #25492 (Invalid deallocation in mysql_stmt_fetch())unknown2007-03-051-14/+8
| | | | | | | | | | Additional patch. mysql_flush_use_result() fixed. libmysqld/lib_sql.cc: now emb_flush_use_result() uses emb_free_rows() duplicating code removed
* bug #25492 (Invalid deallocation in mysql_stmt_fetch)unknown2007-02-131-6/+26
| | | | | | libmysqld/lib_sql.cc: code modified to prevent freeing of memory that wasn't malloc-ed. Now we check if MYSQL_STMT::result was used.
* bug #25492 (Invalid deallocation in mysql_stmt_fetch)unknown2007-01-291-1/+1
| | | | | | | | | | | | Operating with the prepared statements we don't alloc MYSQL_DATA structure, but use MYSQL_STMT's field instead (to increase performance by reducing malloc calls). So we shouldn't free this structure as we did before. libmysqld/lib_sql.cc: we only should free data->alloc here, as the 'data' is a member of STMT structure
* warning count for embedded prepared statements addedunknown2007-01-031-0/+1
| | | | | libmysqld/lib_sql.cc: reading warning count added
* merging fixunknown2007-01-021-2/+0
|
* merging fixunknown2007-01-021-4/+4
|
* embedded-server related fixesunknown2007-01-021-0/+6
| | | | | | | | | | | libmysqld/lib_sql.cc: error message moved to 'stmt' mysql-test/t/distinct.test: temporary disabled in embedded server mysql-test/t/mysqladmin.test: disabled in embedded server sql/sql_prepare.cc: superfluous #ifndef removed
* Merge bk@192.168.21.1:mysql-4.1-optunknown2006-12-082-1/+5
|\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/embt/my41-embt libmysqld/lib_sql.cc: Auto merged sql/item_func.cc: Auto merged
| * embedded-mode tests fixedunknown2006-11-132-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | libmysqld/examples/test-run: mysql_embedded should be run here libmysqld/lib_sql.cc: thd->real_id setup added bootstrap check added mysql-test/t/innodb.test: paths can be different in embedded server - replace_result added sql/item_func.cc: we should compare real_id-s in embedded server
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-291-5/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-4.1-runtime libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql/item_sum.cc: Auto merged
| * | BUG#23383: mysql_affected_rows() returns different values thanunknown2006-11-171-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_stmt_affected_rows() The problem was that affected_rows for prepared statement wasn't updated in the client library on the error. The solution is to always update affected_rows, which will be equal to -1 on the error. libmysql/libmysql.c: Update status variables even in the case of an error. Some variables have a defined value on the error (like affected_rows is -1), others are undefined, so updating them won't harm. libmysqld/lib_sql.cc: Update status variables even in the case of an error. Some variables have a defined value on the error (like affected_rows is -1), others are undefined, so updating them won't harm. tests/mysql_client_test.c: Add test for bug#23383: mysql_affected_rows() returns different values than mysql_stmt_affected_rows().
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-271-5/+19
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-4.1-merge
| * | gen_rec.awk:unknown2006-11-271-5/+19
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined behaviour. Many files: Reenabled build outside ource tree bdb/dist/gen_rec.awk: Fix undefined behaviour. acinclude.m4: Reenabled build outside ource tree configure.in: Reenabled build outside ource tree libmysql_r/Makefile.am: Reenabled build outside ource tree libmysqld/Makefile.am: Reenabled build outside ource tree ndb/config/common.mk.am: Reenabled build outside ource tree ndb/config/type_kernel.mk.am: Reenabled build outside ource tree ndb/config/type_ndbapi.mk.am: Reenabled build outside ource tree ndb/config/type_ndbapitest.mk.am: Reenabled build outside ource tree ndb/config/type_ndbapitools.mk.am: Reenabled build outside ource tree ndb/config/type_util.mk.am: Reenabled build outside ource tree ndb/src/kernel/Makefile.am: Reenabled build outside ource tree
* | Bug #23427 (incompatible ABI change)unknown2006-10-241-5/+5
|/ | | | | | | | | | | | | | the incompatibility was caused by current_stmt member added to the MYSQL structure. It's possible to move it to THD structure instead which saves ABI include/mysql.h: member moved to the THD structure libmysqld/lib_sql.cc: now we use THD member here sql/sql_class.h: current_stmt member added for the embedded server
* Merge bk@192.168.21.1:mysql-4.1unknown2006-07-201-2/+6
|\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-4.1.19983 libmysqld/lib_sql.cc: Auto merged tests/mysql_client_test.c: Auto merged
| * bug #19983 (mysql_client_test_embedded fails)unknown2006-06-021-2/+6
| | | | | | | | | | | | | | libmysqld/lib_sql.cc: field length counting fixed tests/mysql_client_test.c: this test is not for embedded server as it tests kill command
* | Merge bk@192.168.21.1:mysql-4.1unknown2006-07-133-31/+37
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-4.1.16017 include/sql_common.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql-common/client.c: Auto merged sql/sql_parse.cc: Auto merged libmysqld/libmysqld.c: merging
| * | bug #16017 (memory leaks in embedded server)unknown2006-06-013-31/+37
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There actually was 3 different problems - hash_user_connections wasn't cleaned one strdupped database name wasn't freed and stmt->mem_root wasn't cleaned as it was replased with mysql->field_alloc for result For the last one - i made the library using stmt's fields to store result if it's the case. include/mysql.h: statement pointer added to the advanced_command to be checked in embedded server include/sql_common.h: stmt added to the cli_advanced_command interface libmysql/libmysql.c: stmt pointer now sent to advanced_command libmysqld/embedded_priv.h: it's enough to send database name to check_embedded_connection libmysqld/lib_sql.cc: Now we store result directly in the MYSQL_STMT structure to avoid extra copying libmysqld/libmysqld.c: it's enough to only send database pointer to check_embedded_connection sql-common/client.c: stmt fake attribute added to cli_advanced_command sql/sql_parse.cc: hash_user_connections isn't used if no access checks compiled
* | WL#2928 Date Translation NREunknown2006-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (implemented by by Josh Chamas) libmysqld/Makefile.am: Adding new source file mysql-test/r/date_formats.result: Adding test case mysql-test/t/date_formats.test: Adding test case sql/Makefile.am: Adding new source file BitKeeper/etc/ignore: Added libmysqld/sql_locale.cc to the ignore list sql/item_timefunc.cc: Using current locale data, instead of hard coded English names. sql/mysql_priv.h: Adding new type MY_LOCALE, and declaring new global variables. sql/set_var.cc: Adding "lc_time_names" system variable. sql/set_var.h: Adding "lc_time_names" system variable. sql/sql_cache.cc: Adding lc_time_names as a query cache flag. sql/sql_class.cc: Setting default locale to en_US sql/sql_class.h: Adding locale variable into system_variables. sql/sql_locale.cc: Adding new file with locale data for various languages
* | bug #20318 (ctype_ucs2_def test fails with embedded)unknown2006-06-192-45/+10
|/ | | | | | | | | | | | | | | | | | | | | | | | | | there was two problems about charsets in embedded server 1. mysys/charset.c - defined there default_charset_info variable is modified by both server and client code (particularly when --default-charset option is handled) In embedded server we get two codelines modifying one variable. I created separate default_client_charset_info for client code 2. mysql->charset and mysql->options.charset initialization isn't properly done for embedded server - necessary calls added include/sql_common.h: client charset info default declared libmysqld/lib_sql.cc: thd_init_client_charset calls added libmysqld/libmysqld.c: check_embedded_connection moved to client.c to avoid code duplication sql-common/client.c: charset initialization moved to mysql_init_character_set to be used in embedded server sql/sql_parse.cc: thread client charset initialization moved to thd_init_client_charset to avoid code duplication
* Merge mysql.com:/home/mydev/mysql-4.1unknown2005-12-271-0/+0
| | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-bug5390 libmysqld/ha_blackhole.cc: Auto merged sql/sql_update.cc: Auto merged
* Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-042-15/+16
|\ | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck Makefile.am: Auto merged configure.in: Auto merged mysql-test/Makefile.am: Auto merged
| * Makefile.am, configure.in:unknown2005-09-242-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable "make distcheck" to work configure.in: Enable "make distcheck" to work Docs/Makefile.am: Enable "make distcheck" to work Makefile.am: Enable "make distcheck" to work client/Makefile.am: Enable "make distcheck" to work cmd-line-utils/libedit/Makefile.am: Enable "make distcheck" to work include/Makefile.am: Enable "make distcheck" to work libmysql/Makefile.am: Enable "make distcheck" to work libmysql_r/Makefile.am: Enable "make distcheck" to work libmysqld/Makefile.am: Enable "make distcheck" to work libmysqld/examples/Makefile.am: Enable "make distcheck" to work mysql-test/Makefile.am: Enable "make distcheck" to work ndb/docs/Makefile.am: Enable "make distcheck" to work netware/Makefile.am: Enable "make distcheck" to work pstack/Makefile.am: Enable "make distcheck" to work scripts/Makefile.am: Enable "make distcheck" to work sql-bench/Makefile.am: Enable "make distcheck" to work sql/Makefile.am: Enable "make distcheck" to work sql/share/Makefile.am: Enable "make distcheck" to work support-files/Makefile.am: Enable "make distcheck" to work
* | Fix for bug #13501 "build problem: too many arguments to function my_boolunknown2005-09-271-2/+2
|/ | | | | | | | | | | | | | | acl_init". Updated calls to acl_init()/grant_init() in init_embedded_server() - their signatures were changed recently, now they don't need argument for passing pointer to THD object (this code was only compiled if one built embedded server library with --with-embedded-privilege-control switch). libmysqld/lib_sql.cc: acl_init/grant_init() are now used only at server start up so they always allocate temporary THD object and don't need argument for passing pointer to it.
* Fix for bug #9110 (Max_join_size error)unknown2005-07-261-0/+2
| | | | | libmysqld/lib_sql.cc: This should be done during the thread activation
* Makefile.am:unknown2005-07-052-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir client/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir cmd-line-utils/libedit/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir dbug/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir extra/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir heap/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir isam/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysql/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysql_r/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysqld/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysqld/examples/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir merge/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir myisam/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir myisammrg/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir mysql-test/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir mysys/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir netware/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir regex/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir sql/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir strings/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir tests/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir vio/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir tools/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir
* Makefile.am, configure.in:unknown2005-05-101-1/+4
| | | | | | | | | | Enable creation of embedded lib when --with-darwin-mwcc configure.in: Enable creation of embedded lib when --with-darwin-mwcc libmysqld/Makefile.am: Enable creation of embedded lib when --with-darwin-mwcc
* Manually resolve mergeunknown2005-04-292-21/+42
|\ | | | | | | | | | | | | mysql-test/r/query_cache.result: Resolve merge mysql-test/t/query_cache.test: Resolve merge
| * Fix crash in embedded server due to incorrect storage of resultsunknown2005-03-312-21/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the query cache. (Bug #9549) libmysqld/emb_qcache.h: Fix Querycache_stream::use_next_block() to actually use the next block and mark blocks as used when it writes to them. mysql-test/r/query_cache.result: Update results. mysql-test/t/query_cache.test: Add new regression test. libmysqld/emb_qcache.cc: Fix calls to use_next_block() to indicate whether we are writing to the next block or not. sql/sql_cache.cc: Initialize the first block properly when storing a result in the embedded server.
* | - manual mergeunknown2005-04-191-0/+16
|\ \ | |/ |/| | | | | sql/share/Makefile.am: Auto merged
| * - added missing copyright headers to several Makefile.am's (noticedunknown2005-04-191-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | while testing changes to the mysql-copyright scripts libmysqld/examples/Makefile.am: - added a copyright header sql/share/Makefile.am: - added a copyright header tools/Makefile.am: - added a copyright header
* | Fixing blackhole support in libmysqldunknown2005-03-251-1/+2
| | | | | | | | | | libmysqld/Makefile.am: Adding ha_blackhole.cc
* | Fix for bug #8477 (Embedded query_cache test crashes)unknown2005-02-121-7/+11
| | | | | | | | | | libmysqld/emb_qcache.cc: Querycahce data transition fixed
* | - fixed one missing occasion from the mysql_client_test renamingunknown2005-01-201-1/+1
| | | | | | | | | | libmysqld/examples/Makefile.am: - fixed a missing rename (mysql_client_test -> mysql_client_test_embedded)
* | - renamed client_test -> mysql_client_testunknown2005-01-201-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - renamed the tests that use the embedded server (client_test -> mysql_client_test_embedded, mysqltest -> mysql_test_embedded and changed some Makefiles and scripts so they are installed in $bindir (required to be able to run the test suite against the embedded server) tests/mysql_client_test.c: Rename: tests/client_test.c -> tests/mysql_client_test.c libmysql/libmysql.c: - renamed client_test.c to mysql_client_test.c in a comment libmysqld/examples/Makefile.am: - renamed client_test -> mysql_client_test_embedded - renamed mysqltest -> mysqltest_embedded - both will be installed in $bindir scripts/make_binary_distribution.sh: - install mysql_client_test, mysql_client_test_embedded and mysqltest_embedded into bin directory tests/Makefile.am: - renamed client_test to mysql_client_test BitKeeper/etc/ignore: Added tests/mysql_client_test to the ignore list
* | libmysqld.def, libmysql.def:unknown2005-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | Use the invisible tabs (!) libmysql/libmysql.def: Use the invisible tabs (!) libmysqld/libmysqld.def: Use the invisible tabs (!)
* | libmysqld.def, libmysql.def:unknown2005-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | Add missing 'get_defaults_files' to fix linking error. libmysql/libmysql.def: Add missing 'get_defaults_files' to fix linking error. libmysqld/libmysqld.def: Add missing 'get_defaults_files' to fix linking error.
* | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-01-111-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.5920 client/mysql.cc: Auto merged
| * | fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file)unknown2005-01-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: bug #5920 (embedded-server mysql doesn't handle --defaults-file) defaults files handled include/my_sys.h: bug #5920 (embedded-server mysql doesn't handle --defaults-file) get_defaults_file interface added libmysqld/libmysqld.c: just small fix, not related to the bug. mysys/default.c: bug #5920 (embedded-server mysql doesn't handle --defaults-file) get_defaults_files implementation
* | | A fix for Bug#7365 "embedded server for MacOS: problem with preparedunknown2005-01-111-2/+3
|/ / | | | | | | | | | | | | | | | | | | | | statements": no test case, the test case is there already, libmysqld/examples/client_test.c, we just need to run it on a daily basis. libmysqld/lib_sql.cc: Convert statement id to least significant byte first format, uset for data transmission in MySQL protocol. It's assumed to be in this format by mysql_stmt_execute.
* | Tabs removedunknown2004-12-211-6/+6
| |
* | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2004-12-211-26/+52
|\ \ | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean libmysqld/lib_sql.cc: Auto merged
| * | Fix to perform correctly with charsets in embedded serverunknown2004-12-211-26/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-ctype_recoding.result.es~45c6fe567949af: Delete: mysql-test/r/ctype_recoding.result.es BitKeeper/deleted/.del-func_test.result.es~4de135264090aa14: Delete: mysql-test/r/func_test.result.es BitKeeper/deleted/.del-ps_2myisam.result.es~5132bde9c07c41e8: Delete: mysql-test/r/ps_2myisam.result.es BitKeeper/deleted/.del-ps_3innodb.result.es~a3613f0e86132472: Delete: mysql-test/r/ps_3innodb.result.es BitKeeper/deleted/.del-ps_4heap.result.es~956ae2c46b66b6ed: Delete: mysql-test/r/ps_4heap.result.es BitKeeper/deleted/.del-ps_5merge.result.es~6093a834fec21efe: Delete: mysql-test/r/ps_5merge.result.es BitKeeper/deleted/.del-ps_6bdb.result.es~57b94c3756e3d093: Delete: mysql-test/r/ps_6bdb.result.es libmysqld/lib_sql.cc: Charset conversion implemented mysql-test/r/query_cache.result.es: correct test result provided tests/client_test.c: now it works
* | | Fix assertion failure in client_test when linked with the embedded unknown2004-12-191-0/+1
|/ / | | | | | | | | | | | | | | | | library: stmt_update_metadata (used when we update max_length in mysql_stmt_store_result) needs valid row->length. libmysqld/lib_sql.cc: row->length is asserted to be valid in stmt_update_metadata
* | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2004-11-161-3/+8
|\ \ | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean
| * \ Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2004-10-051-3/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.clean
View Lorry Controller Status