- 07 Jun, 2005 5 commits
-
-
unknown authored
Update the InnoDB internal auto-inc counter in ::write_row() if the statement is a REPLACE that fails in a duplicate key error: REPLACE will handle duplicate key error, and the insert will eventually succeed; note that we did NOT change InnoDB's behavior in an UPDATE, because updating the auto-inc counter in an UPDATE would require a bigger patch (Bug #11005) sql/ha_innodb.cc: Update the InnoDB internal auto-inc counter in ::write_row() if the statement is a REPLACE that fails in a duplicate key error: REPLACE will handle duplicate key error, and the insert will eventually succeed; note that we did NOT change InnoDB's behavior in an UPDATE, because updating the auto-inc counter in an UPDATE would require a bigger patch (Bug #11005)
-
unknown authored
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10964 mysql-test/r/information_schema.result: Auto merged mysql-test/t/information_schema.test: Auto merged sql/sql_acl.cc: Auto merged
-
unknown authored
-
unknown authored
mysql-test/r/innodb.result: Update results mysql-test/r/warnings.result: Update results sql/item.cc: Simple optimization sql/item_func.cc: After merge fix sql/item_sum.cc: Fixes for group_concat and rollup (From Ramil) sql/sql_parse.cc: Remove compiler warning sql/sql_select.cc: Fixed problem with rollup
-
unknown authored
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
-
- 06 Jun, 2005 32 commits
-
-
unknown authored
BitKeeper/etc/logging_ok: auto-union client/sql_string.cc: Auto merged configure.in: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/olap.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/warnings.test: Auto merged mysys/raid.cc: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e: Auto merged BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_blackhole.cc: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_geofunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_uniq.cc: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.h: Auto merged sql/procedure.cc: Auto merged sql/protocol.cc: Auto merged sql/protocol_cursor.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_error.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_map.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_udf.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_example.cc: Auto merged sql/examples/ha_tina.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/tztime.cc: Auto merged strings/ctype-win1250ch.c: Auto merged mysql-test/r/func_gconcat.result: merge & ensure that 4.1 and 5.0 source have tests in same order mysql-test/r/innodb.result: merge & ensure that 4.1 and 5.0 source have tests in same order mysql-test/t/func_gconcat.test: merge & ensure that 4.1 and 5.0 source have tests in same order mysql-test/t/innodb.test: merge & ensure that 4.1 and 5.0 source have tests in same order sql/item_func.cc: merge sql/mysqld.cc: merge sql/opt_range.cc: merge sql/sql_parse.cc: merge Give better name to goto labels sql/sql_select.cc: merge
-
unknown authored
into mysql.com:/home/my/mysql-5.0
-
unknown authored
This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error mysql-test/r/auto_increment.result: New tests for auto-increment and replace mysql-test/r/innodb.result: New tests for auto-increment and replace mysql-test/t/auto_increment.test: New tests for auto-increment and replace mysql-test/t/innodb.test: New tests for auto-increment and replace mysys/my_alloc.c: More comments
-
unknown authored
into monster.:D:/Work/mysql5.0
-
unknown authored
into mysql.com:/home/my/mysql-5.0 sql/item_func.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
client/mysqltest.c: undef popen prior to redefining it to avoid compiler warning cast len argument to replace_dynstr_append_mem to int. This should be ok because the replace_dynstr_append method uses strlen to accomplish the same thing. myisam/mi_create.c: cast myisam_block_size down to uint16 to match the struct element block_length mysys/default.c: add (char*) cast to make compiler happy mysys/my_handler.c: add (my_bool) cast to make compiler happy
-
unknown authored
Adding test. ctype-win1250ch.c: Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs Wrong min_sort_char fix. strings/ctype-win1250ch.c: Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs Wrong min_sort_char fix. mysql-test/t/ctype_cp1250_ch.test: Adding test. mysql-test/r/ctype_cp1250_ch.result: Adding test.
-
unknown authored
into mysql.com:/space/my/mysql-5.0 sql/sql_select.cc: Auto merged
-
unknown authored
-
unknown authored
into mysql.com:/home/my/mysql-5.0
-
unknown authored
netware/BUILD/mwenv: A fix for Metrowerks compiler, compiler option to change enum size from 2 bytes to 4 bytes.
-
unknown authored
into mysql.com:/home/my/mysql-5.0 sql/sql_select.cc: Auto merged
-
unknown authored
include/my_sys.h: Metrowerks compiler has _alloca() nowadays. Netware does not have mmap() netware/mysql_test_run.c: A fix for netware mysql_test_run client.
-
unknown authored
netware/BUILD/compile-linux-tools: A patch for Netware builds. This fixes problem with missing mysql_version.h during Linux tools building. netware/BUILD/compile-netware-END: A fix for Netware builds. netware/BUILD/mwenv: A fix for Netware builds, environment variables setup script.
-
unknown authored
into mysql.com:/home/my/mysql-5.0 sql/mysql_priv.h: Auto merged
-
unknown authored
- removed some unreferenced variables - fixed the libmysql project file by removing a duplicate file reference (merge error) sql/item_func.cc: - removed unused variable "Field" from Item_func_sp::sp_result_field sql/sql_select.cc: - removed unreferenced variable "filename" from create_tmp_table sql/unireg.cc: - removed unused variable "firstpos" from make_empty_rec VC++Files/libmysql/libmysql.dsp: - after-merge fix: removed duplicate file ctype-cp932.c
-
unknown authored
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0 sql/sql_select.cc: Auto merged
-
unknown authored
Added a test case for bug #6866. sql_select.cc: Fixed bug #6866. Bug was due to the fact that on_expr was not backed up for the second execution of the stored procedure. sql/sql_select.cc: Fixed bug #6866. Bug was due to the fact that on_expr was not backed up for the second execution of the stored procedure. mysql-test/r/sp.result: Added a test case for bug #6866. mysql-test/t/sp.test: Added a test case for bug #6866.
-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.0.turk
-
unknown authored
UPPER/LOWER now can return a string with different length. mi_test1.c: Adding new arguments. Many files: Changeing caseup/casedn to return a result with different length than argument. sql_string.h: Removing unused method, mysql_priv.h: Removing unused method strings/ctype-big5.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-bin.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-cp932.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-czech.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-euc_kr.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-extra.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-eucjpms.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-gb2312.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-gbk.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-latin1.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-mb.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-simple.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-sjis.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-tis620.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-uca.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-ucs2.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-ujis.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-utf8.c: Changeing caseup/casedn to return a result with different length than argument. strings/ctype-win1250ch.c: Changeing caseup/casedn to return a result with different length than argument. sql/item_strfunc.cc: Changeing caseup/casedn to return a result with different length than argument. sql/item_strfunc.h: Changeing caseup/casedn to return a result with different length than argument. sql/mysql_priv.h: Removing unused method sql/sql_string.h: Removing unused method, client/sql_string.h: Changeing caseup/casedn to return a result with different length than argument. include/m_ctype.h: Changeing caseup/casedn to return a result with different length than argument. myisam/mi_test1.c: Adding new arguments. mysql-test/r/ctype_uca.result: UPPER/LOWER now can return a string with different length. mysql-test/t/ctype_uca.test: UPPER/LOWER now can return a string with different length.
-
unknown authored
extra/yassl/mySTL/memory.hpp: Portability fix, mySTL on Sun Forte 5.4: default template arguments that are based on previous template argument don't work, just remove the fancy syntax (non-default second argument is not used anywhere anyway).
-
unknown authored
into mysql.com:/home/my/mysql-5.0 sql/sp_head.cc: Auto merged sql/sp_rcontext.cc: Auto merged
-
unknown authored
Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file) This fixed bug #11039: InnoDB: Warning: using a partial-field key prefix in search mysql-test/r/innodb.result: Added extra test for bug #11039: InnoDB: Warning: using a partial-field key prefix in search mysql-test/t/innodb.test: Added extra test for bug #11039: InnoDB: Warning: using a partial-field key prefix in search sql/opt_sum.cc: Fixed wrong key length when using MIN() optimization
-
unknown authored
extra/yassl/src/handshake.cpp: Further fixes for aCC: rewrite c-tor invocation to not require any optimization from the compiler.
-
unknown authored
extra/yassl/taocrypt/src/misc.cpp: Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX): we can remove these 2 ifdefed statements, as new handlers are not used anymore (yaSSL new doesn't throw exceptions and does not calls/resets new handlers as prescribed in the standard), but let's leave it to Todd, now just #ifdef the problematic code.
-
unknown authored
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b10539
-
unknown authored
into mysql.com:/space/my/mysql-5.0
-
unknown authored
into mysql.com:/usr/home/ram/work/5.0.b10539 sql/field.cc: Auto merged
-
unknown authored
sql/item_timefunc.cc: Auto merged mysql-test/r/func_time.result: SCCS merged mysql-test/t/func_time.test: SCCS merged
-
unknown authored
into mysql.com:/home/stewart/Documents/MySQL/4.1/bug10948
-
unknown authored
BUILD/check-cpu: fix for powerpc linux
-
- 05 Jun, 2005 3 commits
-
-
unknown authored
-
unknown authored
Try kill all children to the mysql-test-run process when exiting mtr_process.pl: Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting mysql-test-run.pl: Try kill all children to the mysql-test-run process when exiting New --vardir caused problems on Windows Changed faulty calls to error() to mtr_error() mysql-test/mysql-test-run.pl: Try kill all children to the mysql-test-run process when exiting New --vardir caused problems on Windows Changed faulty calls to error() to mtr_error() mysql-test/lib/mtr_report.pl: Try kill all children to the mysql-test-run process when exiting mysql-test/lib/mtr_process.pl: Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting mysql-test/lib/mtr_misc.pl: Try kill all children to the mysql-test-run process when exiting
-
unknown authored
'#pragma interface' (that comes with the #include'd header file)
-