- 02 Jun, 2005 1 commit
-
-
unknown authored
sql/item_func.cc: Restore accidently deleted code
-
- 01 Jun, 2005 26 commits
-
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean sql/sql_table.cc: Auto merged
-
unknown authored
into mysql.com:/home/jimw/my/mysql-5.0-clean mysql-test/r/func_str.result: Auto merged mysql-test/r/lowercase_table2.result: Auto merged mysql-test/r/rpl_failed_optimize.result: Auto merged vio/viossl.c: Auto merged mysql-test/t/func_str.test: Merge from 4.1 sql/item_func.cc: Merge from 4.1 sql/sql_table.cc: Merge from 4.1
-
unknown authored
-
unknown authored
sql/sql_table.cc: Add missing argument
-
unknown authored
mysql-test/r/rpl_failed_optimize.result: Update results
-
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/sql_table.cc: Auto merged
-
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/sql_table.cc: Auto merged
-
unknown authored
mysql-test/r/func_str.result: Update results mysql-test/t/func_str.test: Add regression tests sql/item_func.cc: Handle NULL as first argument to FIELD()
-
unknown authored
into mysql.com:/space/my/mysql-5.0
-
unknown authored
into mysql.com:/space/my/mysql-5.0
-
unknown authored
into mysql.com:/Users/mikron/bug10837
-
unknown authored
Moved enabling of warnings to ensure that no warnings are generated when this test case is executed on a clone where InnoDB is not activated. This would fail the test case in those clones otherwise. mysql-test/r/default.result: Rename: mysql-test/r/bugs.result -> mysql-test/r/default.result mysql-test/t/default.test: Moved enabling of warnings to ensure that no warnings are generated when this test case is executed on a clone where InnoDB is not activated. This would fail the test case in those clones otherwise.
-
unknown authored
into mysql.com:/home/pem/work/mysql-5.0 sql/sql_yacc.yy: Auto merged
-
unknown authored
Return an error if default() is used on a local variable. This is actaully a side-effect of BUG#5967: Stored procedure declared variable used instead of column (to be fixed later), so this is really a workaround until that is fixed. mysql-test/r/sp-error.result: New test case for BUG#10969. mysql-test/t/sp-error.test: New test case for BUG#10969. sql/item.h: Get name of local variable for error messages. sql/sql_yacc.yy: Return an error if default() is applied on a local SP variable.
-
unknown authored
VC++Files/client/mysqlclient.dsp: Auto merged VC++Files/client/mysqlclient_ia64.dsp: Auto merged VC++Files/client/mysqltest.dsp: Auto merged BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/libmysql/libmysql_ia64.dsp: Auto merged VC++Files/strings/strings.dsp: Auto merged VC++Files/strings/strings_ia64.dsp: Auto merged include/config-win.h: Auto merged myisammrg/myrg_open.c: Auto merged mysys/my_getwd.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/ha_myisammrg.cc: Auto merged configure.in: - manual merge, fixed NDB_VERSION_BUILD
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
-
unknown authored
After merge fixes.
-
unknown authored
configure.in: Auto merged scripts/make_binary_distribution.sh: Auto merged
-
unknown authored
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard spec file) BitKeeper/deleted/.del-mysql-max.spec.sh~ca055d86585c1010: Delete: support-files/mysql-max.spec.sh configure.in: - removed references to some obsolete files scripts/make_binary_distribution.sh: - removed references to some obsolete files
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
-
unknown authored
into mysql.com:/space/my/mysql-4.1
-
unknown authored
Have to catch errors from SELECT when opening a cursor. mysql-test/r/sp.result: New test case for BUG#10961. mysql-test/t/sp.test: New test case for BUG#10961. sql/protocol.h: Init data in Protocol_cursor constructor, for error cases. sql/sp_head.cc: Catch "hidden" errors during SELECT when opening a cursor.
-
unknown authored
Manual merge from 4.1. mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged sql/mysql_priv.h: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_yacc.yy: Auto merged
-
unknown authored
-
- 31 May, 2005 13 commits
-
-
unknown authored
into siva.hindu.god:/opt/home/tim/m/50/a
-
unknown authored
mysql-test/r/create.result: SCCS merged mysql-test/t/create.test: SCCS merged
-
unknown authored
After merge fix.
-
unknown authored
into xiphis.org:/usr/home/antony/work2/p4-bug10413.2
-
unknown authored
Hand merged from 4.0. sql/lock.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_table.cc: Auto merged
-
unknown authored
Stop ignoring name parts and check for validity mysql-test/r/create.result: Test for bug#10413 mysql-test/t/create.test: Test for bug#10413 sql/sql_yacc.yy: Bug#10413 Stop ignoring parts of fully qualified names.
-
unknown authored
during creation. Although it returns an error, consistent with the behaviour for other objects. (Unclear why we would allow the creation of SPs with truncated names.) mysql-test/r/sp-error.result: New test case for BUG#9529. mysql-test/t/sp-error.test: New test case for BUG#9529. sql/sp.cc: Check SP name length on creation (and drop). sql/sp.h: New status code for bad (too long) name. sql/sql_parse.cc: New status code for bad (too long) name.
-
unknown authored
merge with latest yaSSL, move templates instantiation into separate file where it is possible extra/yassl/include/buffer.hpp: merge with latest yaSSL extra/yassl/include/crypto_wrapper.hpp: merge with latest yaSSL extra/yassl/include/socket_wrapper.hpp: merge with latest yaSSL extra/yassl/include/yassl_imp.hpp: merge with latest yaSSL extra/yassl/include/yassl_types.hpp: merge with latest yaSSL extra/yassl/mySTL/helpers.hpp: merge with latest yaSSL extra/yassl/mySTL/list.hpp: merge with latest yaSSL extra/yassl/mySTL/memory.hpp: merge with latest yaSSL extra/yassl/mySTL/vector.hpp: merge with latest yaSSL extra/yassl/src/Makefile.am: Include template_instnt.cpp into libyassl_a_SOURCES. extra/yassl/src/buffer.cpp: merge with latest yaSSL extra/yassl/src/cert_wrapper.cpp: merge with latest yaSSL extra/yassl/src/crypto_wrapper.cpp: merge with latest yaSSL extra/yassl/src/handshake.cpp: merge with latest yaSSL extra/yassl/src/lock.cpp: merge with latest yaSSL extra/yassl/src/log.cpp: merge with latest yaSSL extra/yassl/src/socket_wrapper.cpp: merge with latest yaSSL extra/yassl/src/ssl.cpp: merge with latest yaSSL extra/yassl/src/timer.cpp: merge with latest yaSSL extra/yassl/src/yassl_error.cpp: merge with latest yaSSL extra/yassl/src/yassl_imp.cpp: merge with latest yaSSL extra/yassl/src/yassl_int.cpp: merge with latest yaSSL extra/yassl/taocrypt/include/algebra.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/asn.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/block.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/hash.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/integer.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/misc.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/modes.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/runtime.hpp: merge with latest yaSSL extra/yassl/taocrypt/src/Makefile.am: Include template_instnt.cpp into libtaocrypt_a_SOURCES. extra/yassl/taocrypt/src/aestables.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/algebra.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/arc4.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/asn.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/coding.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/dh.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/dsa.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/file.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/integer.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/misc.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/random.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/rsa.cpp: merge with latest yaSSL
-
unknown authored
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 sql/item.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
Fixed bug #10982. item.cc: Fixed bug #10982. In the function Item_ref::val_decimal by mistake the method Item_ref::val_decimal was used instead of Item_ref::val_decimal_result. sql/item.cc: Fixed bug #10982. In the function Item_ref::val_decimal by mistake the method Item_ref::val_decimal was used instead of Item_ref::val_decimal_result. mysql-test/r/olap.result: Fixed bug #10982.
-
unknown authored
Post merge corrections. mysql-test/r/olap.result: Post merge corrections.
-
unknown authored
sql/item.cc: Get the size before trashing (in debug mode only).
-
unknown authored
into mysql.com:/home/pem/work/mysql-5.0 sql/item_subselect.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged
-