- 12 Dec, 2006 3 commits
-
-
unknown authored
into weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime sql/sp_head.cc: Auto merged
-
unknown authored
mysql-test/t/sp_stress_case.test: Minor cleanup ... the test is now faster, even in debug builds
-
unknown authored
into weblab.(none):/home/marcsql/TREE/mysql-5.0-19194 sql/sp_head.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_yacc.yy: Auto merged
-
- 11 Dec, 2006 1 commit
-
-
unknown authored
limitation) Bug#24854 (Mixing Searched Case with Simple Case inside Stored Procedure crashes Mysqld) Implemented code review (19194) comments mysql-test/r/sp_stress_case.result: Implemented code review comments : use SQL instead of a shell script to generate the code mysql-test/t/sp_stress_case.test: Adjusted sql/sql_yacc.yy: Added more explicit comments BitKeeper/deleted/.del-sp_stress_case.sh: Delete: mysql-test/t/sp_stress_case.sh
-
- 04 Dec, 2006 4 commits
-
-
unknown authored
into weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
-
unknown authored
into outpost.site:/home/cps/mysql/trees/5.0-runtime-19044
-
unknown authored
On windows IM aborted on assert once one stoppped it. The reason is that we didn't close the sockets on windows and therefore, the listener thread wasn't able to finish. This happened because we used close() call for it. While on windows one should use closesocket(). On other platfroms we have appropriate defines for closesocket(), so this is the function which should be used. server-tools/instance-manager/listener.cc: close -> closesocket
-
unknown authored
-
- 01 Dec, 2006 1 commit
-
-
unknown authored
--cursor_protocol": fix a misleading error message in case of SELECT .. INTO. sql/sql_class.cc: Implement select_result::check_simple_select hierarchy to support correct error messages in case of SELECT .. INTO and C API cursors. sql/sql_class.h: Set the error message inside the function that checks for the error condition (simple_select, renamed to check_simple_select). sql/sql_prepare.cc: Use a new method that now sets the error. tests/mysql_client_test.c: Add a test case for Bug#24179 "select b into $var" fails with --cursor_protocol" (check for the right error message and error code).
-
- 30 Nov, 2006 1 commit
-
-
unknown authored
into weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
-
- 29 Nov, 2006 13 commits
-
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime
-
unknown authored
into bodhi.local:/opt/local/work/mysql-4.1-runtime
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637 sql/sql_yacc.yy: Auto merged
-
unknown authored
into weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime mysql-test/include/sp-vars.inc: Auto merged
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0-build
-
unknown authored
Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from inside a stored routine and MySQL is compiled with Query Cache support (this is not in the manual). The problem was that the condition test of "we are inside stored routine" was reversed, thus CONCURRENT _worked only_ from stored routine. The solution is to use proper condition test. No test case is provided because the test case would require a large amount of input, and it's hard to tell is SELECT is really blocked or just slow (subject to race). sql/sql_yacc.yy: Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT, which was reversed, and return valid value if we are in SP.
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
mysql-test/mysql-test-run.pl: remove dependency on Data::Dumper, it's not used anywhere
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged sql/item_sum.cc: Auto merged tests/mysql_client_test.c: Manual merge: use local.
-
- 28 Nov, 2006 10 commits
-
-
unknown authored
into bodhi.local:/opt/local/work/mysql-5.0-runtime libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/t/func_str.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_sum.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/t/wait_for_socket.sh: Manual merge. sql/sql_cache.cc: Manual merge.
-
unknown authored
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
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
into trift2.:/MySQL/M50/push-5.0
-
unknown authored
netware/BUILD/nwbootstrap: Editing "mwenv" is now obsolete, as this file gets its variable settings from the environment already; and it is even plain wrong, because the assignments to those variables are written in such a way that replacing the variables by values (as tried here) yields invalid shell lines.
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0-build
-
unknown authored
Handle the case "sql_yacc.cc" is pregenerated or not, and that the case where the source and build tree is the same or not. sql/Makefile.am: Handle the case "sql_yacc.cc" is pregenerated or not, and that the case where the source and build tree is the same or not.
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0-build Docs/Makefile.am: Auto merged
-
unknown authored
If using \$(srcdir)/mysql.info in action, use same in rule. Docs/Makefile.am: If using \$(srcdir)/mysql.info in action, use same in rule.
-
unknown authored
into trift2.:/MySQL/M50/push-5.0 extra/yassl/taocrypt/taocrypt.dsp: Auto merged extra/yassl/yassl.dsp: Auto merged extra/yassl/yassl.vcproj: Auto merged extra/yassl/taocrypt/taocrypt.vcproj: Auto merged extra/yassl/taocrypt/benchmark/benchmark.dsp: Auto merged extra/yassl/taocrypt/test.dsp: Auto merged extra/yassl/testsuite/testsuite.dsp: Auto merged
-
- 27 Nov, 2006 7 commits
-
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0-build
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0-merge sql-common/my_time.c: Auto merged
-
unknown authored
into mysql.com:/home/kent/bk/mysql-4.1-merge
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0
-
unknown authored
Reenabled build outside source tree config/ac-macros/ha_berkeley.m4: Reenabled build outside source tree config/ac-macros/ha_innodb.m4: Reenabled build outside source tree config/ac-macros/ha_ndbcluster.m4: Reenabled build outside source tree extra/yassl/src/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/benchmark/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/src/Makefile.am: Reenabled build outside source tree extra/yassl/taocrypt/test/Makefile.am: Reenabled build outside source tree extra/yassl/testsuite/Makefile.am: Reenabled build outside source tree libmysql/Makefile.shared: Reenabled build outside source tree ndb/src/mgmsrv/Makefile.am: Reenabled build outside source tree
-
unknown authored
into mysql.com:/Users/kent/mysql/bk/build/mysql-5.0-build mysql-test/mysql-test-run.pl: Auto merged
-
unknown authored
into mysql.com:/home/kent/bk/mysql-5.0
-