summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | Fix to compile sql/examples content in embedded serverunknown2004-09-261-3/+8
| | | | | | | | | | | | | | | | | | | | libmysqld/Makefile.am: Commands to compile sql/examples content in libmysqld added
* | | | A lot of fixes for prepared statements (PS):unknown2004-10-261-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New mysqltest that can run mysqltest with PS Added support for ZEROFILL in PS Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result() Updated test cases to support --ps-protocol (Some tests are still run using old protocol) Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2... Fixed crash in PS when using sub queries Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever" Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries) Fix for PS and SELECT ... PROCEDURE Reset all warnings when executing a new PS query group_concat(...ORDER BY) didn't work with PS Fixed problem with test suite when not using innodb BitKeeper/deleted/.del-innodb-lock-master.opt~f76a4a1999728f87: Delete: mysql-test/t/innodb-lock-master.opt client/Makefile.am: mysqltest now uses regex client/mysqltest.c: Added support for testing of prepared statements (with --ps-protocol) Main code was done by Kent, I did mainly some cleanups and minor bug fixes New test commands: --disable_ps_protocol --enable_ps_protocol NOTE: new code still has some things that needs to be cleaned up. For example run_query_stmt_handle_error() should be made more general so that same code can be used also by 'normal' queries configure.in: mysqltest now uses regex libmysql/libmysql.c: Reset warning_count after prepare (safety). In the future we should also provide warnings on prepare integer -> string conversion now handles ZEROFILL double -> string conversion is now closer to the one in the server Fixed crash when one called mysql_stmt_store_result() without preceding mysql_stmt_bind_result() libmysqld/examples/Makefile.am: mysqltest now uses regex mysql-test/include/have_query_cache.inc: Fixes for --ps-protocol mysql-test/include/ps_conv.inc: Fixes for --ps-protocol mysql-test/mysql-test-run.sh: Added options --ps-protocol mysql-test/r/ctype_utf8.result: Fixed test case mysql-test/r/fulltext_cache.result: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/r/fulltext_left_join.result: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/r/fulltext_multi.result: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/r/innodb-lock.result: Fixed test to work even if Innodb is not compiled in. mysql-test/t/create.test: Fixes for --ps-protocol mysql-test/t/ctype_utf8.test: Remove warnings mysql-test/t/date_formats.test: Fixes for --ps-protocol mysql-test/t/fulltext_cache.test: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/t/fulltext_left_join.test: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/t/fulltext_multi.test: Changed output of MATCH to use round() to get same numbers with --ps-protocol mysql-test/t/func_group.test: Fixes for --ps-protocol mysql-test/t/func_sapdb.test: Fixes for --ps-protocol mysql-test/t/innodb-lock.test: Fixed test to work even if Innodb is not compiled in. mysql-test/t/insert.test: Fixes for --ps-protocol mysql-test/t/insert_select.test: Fixes for --ps-protocol mysql-test/t/insert_update.test: Fixes for --ps-protocol mysql-test/t/metadata.test: Fixes for --ps-protocol mysql-test/t/multi_statement.test: Fixes for --ps-protocol mysql-test/t/ps_1general.test: Fixes for --ps-protocol mysql-test/t/rollback.test: Fixes for --ps-protocol mysql-test/t/rpl_redirect.test: Fixes for --ps-protocol mysql-test/t/rpl_user_variables.test: Fixes for --ps-protocol mysql-test/t/select.test: Fixes for --ps-protocol mysql-test/t/status.test: Fixes for --ps-protocol mysql-test/t/type_blob.test: Fixes for --ps-protocol mysql-test/t/type_float.test: Fixes for --ps-protocol mysql-test/t/union.test: Fixes for --ps-protocol mysql-test/t/warnings.test: Fixes for --ps-protocol mysys/my_alloc.c: More debugging information sql-common/client.c: More debugging information sql-common/my_time.c: TIME didn't support full range with PS sql/field.cc: TIME didn't support full range with PS sql/item_cmpfunc.cc: IN(constants,...) didn't work with PS sql/item_subselect.cc: Some subqueries didn't work with PS sql/item_sum.cc: group_concat(...ORDER BY) didn't work with PS Removed variable warning_available as 'warning' can be used for this. sql/item_sum.h: Removed not needed variable sql/protocol.cc: TIME didn't support full range with PS sql/set_var.cc: Style fix sql/sql_base.cc: setup_wild() didn't properly restore old arena, which caused core dump in PS when using SELECT * FROM t1 NATURAL JOIN t2... sql/sql_class.cc: Style fix sql/sql_error.cc: Style fix sql/sql_insert.cc: Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever" sql/sql_lex.h: Fix for PS and procedures sql/sql_parse.cc: More debugging information Make a copy of 'db' in PS as this may change Fixed wrong permissions check in PS and multi-table updates sql/sql_prepare.cc: Fix for PS and SELECT ... PROCEDURE Reset all warnings when executing a new query sql/sql_union.cc: Fixes for PS and SELECT ... PROCEDURE Reset 'with_wild' as 'wild' is resolved on prepare
* | | Fix asked by Ranger.unknown2004-09-251-1/+1
|/ / | | | | | | | | | | | | | | If embedded library gets empty string as a hostname it should use embedded connection libmysqld/libmysqld.c: Check for empty string added
* | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0unknown2004-08-262-0/+140
|\ \ | |/ | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-08-262-0/+140
| |\ | | | | | | | | | | | | | | | | | | into hegel.txg.br:/home/miguel/bk/mysql-4.0
| | * Adding binary version information for debug/release version of libmysqld.dllunknown2004-08-252-0/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a customer request for to get the XP Logo Certification. Note for LenZ: Adding to the project libmysqld.dsp the file libmysqld.rc at compilation time will be created the libmysqld.res and this linked. For every release edit the libmysqld.rc version number.
| * | All 'Makefile's must use '$(AR)' (not just 'ar') because the variable may ↵unknown2004-08-241-2/+2
| |/ | | | | | | | | | | | | | | | | contain options. libmysqld/Makefile.am: Always use 'make' variable '$(AR)' so that options (AIX 64 bit!) are included. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * Fix for bug #4531(64bit embedded server crashes)unknown2004-07-211-6/+7
| | | | | | | | | | | | | | | | There is some 'ulong'<->'uint' mess in libmysqld.c libmysqld/libmysqld.c: Several local variables made 'ulong' from 'uint'
| * Removed not used file sql_olap.ccunknown2004-06-181-1/+1
| |
* | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-08-241-5/+5
|\ \ | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.5066
| * | Fix for bug #5066(Wrong result after subselect with an error)unknown2004-08-231-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | In this case we have to clear thd->data after errorneous query. So i just move thd->data cleanup to emb_advanced_command libmysqld/lib_sql.cc: Cleaning thd->data moved to emb_advanced_command
* | | bdb bugfix: LTLIBOBJS didn't take --disable-shared into accountunknown2004-08-231-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | fix for bdb not ending up into libmysqld.a bdb/dist/configure.ac: bdb bugfix: LTLIBOBJS didn't take --disable-shared into account configure.in: build bdb with --disable-shared for libdb.a to go into libmysqld.a libmysqld/examples/Makefile.am: incorrect "bugfix" undone. bdb should be in libmysqld.a
* | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2004-08-191-11/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.emb libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql-common/client.c: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_prepare.cc: Auto merged
| * | addition to fixes about #4700, 4701unknown2004-08-191-0/+6
| | | | | | | | | | | | | | | | | | | | | libmysqld/lib_sql.cc: Comment added sql/sql_prepare.cc: Necessary line added to emb_insert_params_with_log
| * | Several fixes to make tests working for embedded libraryunknown2004-07-231-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysqld/lib_sql.cc: max_allowed_packet - don't send client one to global thread initialization fixed "std" to "def" in catalog name sql/mysqld.cc: added initialization of global_system_variables.max_allowed_packet sql/set_var.cc: don't do this in embedded library
| * | Fixes for bugs in embedded library:unknown2004-07-221-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #4700 (Unsigned value returned as signed) just no appropriate checking #4701 (Errors returned earlier than expected) all errors returned from send_command() #4702 (Result isn't freed properly if there's no retrieval) flush_use_result has only 'client' version and should be made 'virtual' include/mysql.h: flush_use_result 'virtual' method added to MYSQL (#4701) include/sql_common.h: no flush_use_result() now (#4702) libmysql/libmysql.c: call of the flush_use_result changed (#4702) libmysqld/lib_sql.cc: now errors returned from emb_advanced_command() or from emb_read_rows() depending on if number of returned fields is not 0 (#4701) emb_flush_use_result() implementation (#4702) sql-common/client.c: cli_flush_use_result() implementation (#4702) sql/sql_prepare.cc: unsigned flag now checked (#4700)
* | | bug#4817 catalog name is "def"unknown2004-07-301-2/+2
| | |
* | | WL#1518, "make bundled zlib usable for unix builds": unknown2004-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | required autotools macro written and deployed in all apropriate Makefile.ams. Use cases checked: - linux, standard location of zlib, no ndb - linux, standard locatoin of zlib, with ndb - linux, non-standard location of zlib, no ndb - hpux11, use of bundled zlib, no ndb The only non-checked case is non-standard location of zlib (or use of bundled zlib) + ndb. I wasn't able to check it as ndb/ just won't compile on beasts like AIX52 or HPUX11, where such a check is possible. It didn't compile there before as these systems dont't have installed zlib, so nothing got broken ;) Makefile.am: WL#1518 "make bundled zlib usable for unix builds", part 2: - zlib dir should be built only if there is no system zlib available; with introducing of DIST_SUBDIRS goal, os2, BUILD and SSH now only entered if make dist acinclude.m4: WL#1518, "make bundled zlib usable for unix builds": - actual implementation of the check for various zlib usage options configure.in: WL#1518, "make bundled zlib usable for unix builds": - MYSQL_CHECK_ZLIB_WITH_COMPRESS deployed libmysql/Makefile.am: WL#1518, "make bundled zlib usable for unix builds": - support for non-standard zlib include dir added libmysql_r/Makefile.am: WL#1518, "make bundled zlib usable for unix builds": - support for non-standard zlib include dir added libmysqld/Makefile.am: WL#1518, "make bundled zlib usable for unix builds": - support for non-standard zlib include dir added myisam/Makefile.am: WL#1518, "make bundled zlib usable for unix builds": - support for non-standard zlib binary dir added mysys/Makefile.am: WL#1518, "make bundled zlib usable for unix builds": - support for non-standard zlib include dir added sql/Makefile.am: WL#1518, "make bundled zlib usable for unix builds": - support for non-standard zlib include dir and library dir added tools/Makefile.am: WL#1518, "make bundled zlib usable for unix builds": - support for non-standard zlib include dir added - copyright added