- 11 Feb, 2005 7 commits
-
-
unknown authored
BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged include/my_pthread.h: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/table.cc: SCCS merged
-
unknown authored
into mysql.com:/home/mydev/mysql-4.1-bug8306
-
unknown authored
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 BitKeeper/etc/logging_ok: auto-union extra/replace.c: Auto merged
-
unknown authored
Adjusted results of the test case for bug #7520 for 4.1. mysql-test/r/select.result: Adjusted results of the test case for bug #7520 for 4.1.
-
unknown authored
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0 BitKeeper/etc/logging_ok: auto-union extra/replace.c: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged sql/table.cc: Auto merged
-
unknown authored
Added a test case for bug #7520. table.cc: Fixed bug #7520. The bug was caused by a wrong calculation of the field max_key_length for a TABLE structure when there was an index on a blob field. sql/table.cc: Fixed bug #7520. The bug was caused by a wrong calculation of the field max_key_length for a TABLE structure when there was an index on a blob field. mysql-test/t/select.test: Added a test case for bug #7520. mysql-test/r/select.result: Added a test case for bug #7520.
-
unknown authored
Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks... VC++Files/tests/mysql_client_test.dsp: fix request by Kent sql/item.cc: fix requested by kent
-
- 10 Feb, 2005 20 commits
-
-
unknown authored
BitKeeper/etc/logging_ok: auto-union extra/replace.c: Auto merged BitKeeper/triggers/post-commit: Merge changes
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.0-clean
-
unknown authored
-
unknown authored
binlog-do-db or binlog-ignore-db are in effect. (In the future 5.1? 5.0? I think each statement should be verified against the filtering criteria based on the database it *uses* and not the *current* one. But, right now the *current* database is what counts according to the semantics of the manual.) sql/log.cc: BUG#6749: If there is no current database, then nothing should be binlogged if binlog-do-db or binlog-ignore-db are in effect. (In the future I think that each statement should be verified against the filtering criteria based on the database it *uses* and not the *current* one. But, right now the *current* database is what counts according to the semantics of the manual.)
-
unknown authored
into mysql.com:/home/bk/b7853-mysql-5.0 client/mysqlbinlog.cc: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged
-
unknown authored
It was a thread stack overrun. IA64 had its own stack size section already. Enlarged its default stack size from 192K to 256K.
-
unknown authored
into mysql.com:/home/kostja/work/mysql-5.0-root libmysql/libmysql.c: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
libmysql/libmysql.c: And now put it to the proper place and make it work (Bug#7990) tests/mysql_client_test.c: Enable the test for bug#7990
-
unknown authored
into mysql.com:/home/kostja/work/mysql-5.0-root libmysql/libmysql.c: Auto merged tests/mysql_client_test.c: Auto merged
-
unknown authored
-
unknown authored
reset mysql->net.last_error": the solution is to clear MYSQL->net error before performing COM_CLOSE: if the call succeeds, the connection is usable for other statements. More comprehensive fix is to clear MYSQL->net for all recoverable errors at the time they happen, it will be implemented in 5.0 as it introduces incompatibility in behavior. libmysql/libmysql.c: A simple fix for Bug#7990 "mysql_stmt_close doesn't reset mysql->net.last_error" tests/mysql_client_test.c: A test case for Bug#7990 " mysql_stmt_close doesn't reset mysql->net.last_error"
-
unknown authored
libmysql/libmysql.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged
-
unknown authored
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0 mysql-test/mysql-test-run.sh: Auto merged
-
unknown authored
After merge fixes Don't give duplicate warnings for some ::store() functions mysql-test/mysql-test-run.sh: Added back missing line mysql-test/r/ps_2myisam.result: Update results after removing duplicate warnings from ::store() mysql-test/r/ps_3innodb.result: Update results after removing duplicate warnings from ::store() mysql-test/r/ps_4heap.result: Update results after removing duplicate warnings from ::store() mysql-test/r/ps_5merge.result: Update results after removing duplicate warnings from ::store() sql/field.cc: Don't give duplicate warnings for some ::store() functions Before we could get different number of warnings in the test suite for different platforms sql/field.h: Update results after removing duplicate warnings from ::store() sql/sql_class.h: Update results after removing duplicate warnings from ::store() sql/sql_error.cc: Update results after removing duplicate warnings from ::store() sql/sql_list.h: After merge fix
-
unknown authored
mysql-test/mysql-test-run.sh: Use local var for the individulisation of tracefile name
-
unknown authored
into mysql.com:/home/my/mysql-5.0
-
unknown authored
libmysql/libmysql.c: Fix for bug#8330 "mysql_stmt_execute crashes": we need to bail out from mysql_stmt_execute if mysql->net is occupied with a result set of another statement. Otherwise on the next attempt to use net we get a crash, as it's freed in case of error. tests/mysql_client_test.c: A test case for Bug#8330 "mysql_stmt_execute craches" (libmysql)
-
unknown authored
sql/sql_parse.cc: Added missing #ifdef HAVE_INNOBASE_DB:s.
-
unknown authored
into mysql.com:/home/jimw/my/mysql-4.1-clean
-
unknown authored
BitKeeper/etc/ignore: auto-union client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/help_end.h: Auto merged include/help_start.h: Auto merged myisam/myisamlog.c: Auto merged mysql-test/r/group_by.result: Auto merged mysql-test/r/heap_hash.result: Auto merged BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/subselect.test: Auto merged ndb/src/kernel/vm/FastScheduler.cpp: Auto merged netware/mysql_test_run.c: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_select.cc: Auto merged netware/BUILD/nwbootstrap: merge: keep local scripts/make_binary_distribution.sh: merge: keep local sql/ha_heap.cc: Trivial merge sql/ha_innodb.cc: Auto merge (Code already existed in 5.0) sql/item_cmpfunc.cc: Simple merge sql/item_func.cc: Simple merge sql/item_row.cc: Simple merge sql/item_strfunc.cc: Simple merge sql/item_subselect.cc: Merge with sanjas optimzation patch, but keep old code withing ifdef as a reference until this is fixed
-
- 09 Feb, 2005 13 commits
-
-
unknown authored
into mysql.com:/home/my/mysql-5.0 sql/mysqld.cc: Auto merged
-
unknown authored
This removes a (small) memory leak. sql/nt_servc.h: Indentation change
-
unknown authored
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 sql/item_cmpfunc.cc: Auto merged
-
unknown authored
-
unknown authored
zlib) config/ac-macros/zlib.m4: Fix bad 4.1->5.0 merge
-
unknown authored
into mysql.com:/home/my/mysql-4.1 sql/sql_select.cc: Auto merged
-
unknown authored
into mysql.com:/space/my/mysql-4.1-merge
-
unknown authored
into mysql.com:/space/my/mysql-5.0 mysql-test/Makefile.am: Auto merged
-
unknown authored
-
unknown authored
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the commercial distribution Build-tools/mysql-copyright-2: - added functionality to replace a copyright header in .sql files, too (needed for updating scripts/fill_help_tables.sql in the commercial source distribution) scripts/fill_help_tables.sh: - added copyright header on top of the fill_help_tables.sql file (BUG#5772)
-
unknown authored
VC++Files/mysql.dsw: Auto merged mysql-test/my_create_tables.c: Auto merged mysql-test/my_manage.c: Auto merged mysql-test/t/ps_1general.test: Auto merged
-
unknown authored
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
-
unknown authored
mysql-test/mysql-test-run.sh: Adding master_id to tracefile name if it's set
-