summaryrefslogtreecommitdiff
path: root/strings
Commit message (Collapse)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-08-171-2/+2
|\ | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt mysql-test/r/view.result: Auto merged
| * Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-08-161-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2 mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/ctype_cp1250_ch.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/r/insert_select.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/ctype_cp1250_ch.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged BitKeeper/deleted/.del-ps_6bdb.result: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged storage/myisam/mi_unique.c: Auto merged
| | * Merge mysql.com:/usr/home/bar/mysql-4.1.b19741unknown2006-08-151-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0.b19741merge strings/ctype-win1250ch.c: Coding style fix
| | | * Bug#19741 segfault with cp1250 charset + like + primary key + 64bit osunknown2006-07-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LIKE craashed with a pattern having letters in the range 128..255 (e.g. A WITH ACUTE or C WITH CARON) because of wrong cast from signed char to unsigned int. mysql-test/r/ctype_cp1250_ch.result: Adding test case mysql-test/t/ctype_cp1250_ch.test: Adding test case strings/ctype-win1250ch.c: Fixing wrong cast from "signed char" -> "uint" to "signed char" -> "unsigned char" -> uint, to properly handle bytes 128..255.
* | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-08-091-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
| * | | Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfootunknown2006-08-081-2/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2 Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149: Auto merged configure.in: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/merge.test: Auto merged sql/field.h: Auto merged sql/ha_myisammrg.cc: Auto merged BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0: Auto merged BitKeeper/deleted/.del-libmysqld_ia64.dsp~578ab58d5f281d2a: Auto merged BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2: Auto merged BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e: Auto merged BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c: Auto merged BitKeeper/deleted/.del-mysqldemb_ia64.dsp~c7f7d75d542393cd: Auto merged BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e: Auto merged BitKeeper/deleted/.del-mysqldmax_ia64.dsp~25006b7cc0725ad1: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_class.cc: Auto merged support-files/mysql.spec.sh: Auto merged include/my_base.h: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge mysql-test/r/federated.result: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge mysql-test/t/federated.test: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/field.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/ha_federated.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/handler.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge tests/mysql_client_test.c: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
| | * | Merge trift2.:/M41/push-1-4.1unknown2006-07-241-2/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/M50/merge-4.1-to-5.0 strings/strtod.c: Manual merge: Null merge with header file cleanup ("my_base.h" includes "my_global.h", so we do not need both).
| | | * strings/strtod.c : Ensure the definition of "EOVERFLOW" is available.unknown2006-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.0, this is already solved, so that is a null-merge ("ul"). strings/strtod.c: This file needs the definition of "EOVERFLOW", which is on some platforms (Windows, OpenBSD) provided only by "my_base.h". As this in turn includes "my_global.h", the include file name can be changed.
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-06-301-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
* | | | | Bug#16172 DECIMAL data type processed incorrectlyunknown2006-08-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue an 'overflow warning' if result value is bigger than max possible value include/decimal.h: Bug#16172 DECIMAL data type processed incorrectly new function decimal_intg() mysql-test/r/cast.result: Bug#16172 DECIMAL data type processed incorrectly result fix mysql-test/r/type_newdecimal.result: Bug#16172 DECIMAL data type processed incorrectly test result mysql-test/r/view.result: Bug#16172 DECIMAL data type processed incorrectly result fix mysql-test/t/type_newdecimal.test: Bug#16172 DECIMAL data type processed incorrectly test case sql/item_create.cc: Bug#16172 DECIMAL data type processed incorrectly do not increase decimal part on 2(according to manual) sql/my_decimal.h: Bug#16172 DECIMAL data type processed incorrectly new function my_decimal_intg() strings/decimal.c: Bug#16172 DECIMAL data type processed incorrectly new function decimal_intg()
* | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-08-032-32/+32
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
| * | | | Bug#20795: extractvalue() won't accept names containing a dot (.)unknown2006-07-252-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dot character was not considered as a valid identifier body character. mysql-test/r/xml.result: Adding test case mysql-test/t/xml.test: Adding test case sql/item_xmlfunc.cc: Treat dot character as a valid identifier body part. strings/ctype.c: Fixing to use '/' instead of '.' as a delimiter in charset file parser. strings/xml.c: Fixing to use '/' instead of '.' as a delimiter.
* | | | | Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysqlunknown2006-07-301-3/+10
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql client/mysql.cc: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/group_min_max.result: Auto merged BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1: Auto merged BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2: Auto merged BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e: Auto merged BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/func_gconcat.test: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/group_min_max.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/innodb_mysql.test: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/view.test: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/opt_range.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/time.cc: Auto merged storage/ndb/test/ndbapi/Makefile.am: Auto merged strings/decimal.c: Auto merged mysql-test/r/analyse.result: Manual merge mysql-test/r/bigint.result: Manual merge mysql-test/r/create.result: Manual merge mysql-test/r/information_schema.result: Manual merge mysql-test/r/ps_2myisam.result: Manual merge mysql-test/r/ps_3innodb.result: Manual merge mysql-test/r/ps_4heap.result: Manual merge mysql-test/r/ps_5merge.result: Manual merge mysql-test/r/ps_6bdb.result: Manual merge mysql-test/r/rpl_insert_id.result: Manual merge mysql-test/r/select.result: Manual merge mysql-test/r/sp.result: Manual merge mysql-test/r/subselect.result: Manual merge mysql-test/t/information_schema.test: Manual merge mysql-test/t/rpl_insert_id.test: Manual merge sql/field.h: Manual merge sql/item.cc: Manual merge sql/item.h: Manual merge sql/item_strfunc.h: Manual merge sql/item_sum.cc: Manual merge sql/mysql_priv.h: Manual merge sql/share/errmsg.txt: Manual merge sql/sql_class.h: Manual merge sql/sql_select.cc: Manual merge
| * | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2006-07-131-3/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt sql/item.h: Auto merged sql/item_strfunc.cc: Auto merged
| | * | | Bug #20569 Garbage in DECIMAL results from some mathematical functionsunknown2006-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * portability fix: moved the macro call after the C declaration strings/decimal.c: Bug #20569 Garbage in DECIMAL results from some mathematical functions * moved the macro call after the C declaration
| | * | | Bug #20569 Garbage in DECIMAL results from some mathematical functionsunknown2006-07-061-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding decimal "digits" in multiplication resulted in signed overflow and producing wrong results. Fixed by using large enough buffers and intermediary result types : dec2 (currently longlong) to hold result of adding decimal "digits" (currently int32). mysql-test/r/select.result: Bug #20569 Garbage in DECIMAL results from some mathematical functions * test suite for the bug mysql-test/t/select.test: Bug #20569 Garbage in DECIMAL results from some mathematical functions * test suite for the bug strings/decimal.c: Bug #20569 Garbage in DECIMAL results from some mathematical functions * fixed the overflow in adding decimal "digits"
* | | | | Merge bodhi.local:/opt/local/work/tmp_mergeunknown2006-07-131-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0 BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555: Auto merged configure.in: Auto merged include/my_global.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/key.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysys/my_handler.c: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged storage/heap/hp_test1.c: Auto merged storage/heap/hp_test2.c: Auto merged strings/ctype-mb.c: Auto merged support-files/mysql.spec.sh: Auto merged sql/table.cc: Use local (manual merge) mysql-test/mysql-test-run.sh: Manual merge. sql/ha_ndbcluster.cc: Manual merge. sql/item.cc: Manual merge. tests/mysql_client_test.c: Manual merge.
| * | | | Fix Windows build problem following previous push.unknown2006-06-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | strings/strtod.c: Fix Windows build problem, EOVERFLOW is defined in my_base.h on Windows.
| * | | | Fixing windows build.unknown2006-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings/strtod.c: Reverting previous change to include files (angle brackets instead of quotes) that broke windows build
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-06-301-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_parse.cc: Auto merged
| | * | | Merge mysql.com:/home/my/mysql-4.1unknown2006-06-301-2/+2
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0 include/my_global.h: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysys/my_handler.c: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_parse.cc: Auto merged strings/strtod.c: Auto merged mysql-test/r/func_time.result: Manual merge mysql-test/t/func_time.test: Manual merge
| | | * | Fixed include file usageunknown2006-06-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hp_test2 now works again Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) heap/hp_test1.c: Portability fix heap/hp_test2.c: Added max_table_size (fixes that hp_test2 works again) include/my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 (Bug #19694) mysys/my_handler.c: Added missing include file strings/strtod.c: Fixed include files
| * | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-optunknown2006-06-302-14/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/merge-5.0 sql/sql_select.cc: Auto merged strings/ctype-mb.c: Auto merged
| | * | | Merge xiphis.org:/home/antony/work2/p4-bug12096.2unknown2006-06-281-6/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/p4-bug12096.2-merge configure.in: Auto merged sql/mysqld.cc: Auto merged
* | | \ \ \ Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-optunknown2006-06-301-15/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/merge-5.1 mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_sum.cc: Auto merged sql/opt_range.cc: Auto merged sql/spatial.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_update.cc: Auto merged strings/ctype-mb.c: Auto merged
| * | | | | Post-merge fix.unknown2006-06-221-6/+1
| | | | | |
| * | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1-optunknown2006-06-211-9/+16
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into rurik.mysql.com:/home/igor/mysql-5.0-opt mysql-test/t/ctype_utf8.test: Auto merged strings/ctype-mb.c: Auto merged mysql-test/r/ctype_utf8.result: SCCS merged
| | * | | | Fixed bug #16674.unknown2006-06-201-9/+16
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The length of the prefix of the pattern string in the LIKE predicate that determined the index range to be scanned was calculated incorrectly for multi-byte character sets. As a result of this in 4. 1 the the scanned range was wider then necessary if the prefix contained not only one-byte characters. In 5.0 additionally it caused missing some rows from the result set. mysql-test/r/ctype_utf8.result: Added test cases for bug #16674. mysql-test/t/ctype_utf8.test: Added test cases for bug #16674. strings/ctype-mb.c: Fixed bug #16674. The length of the prefix of the pattern string in the LIKE predicate that determined the index range to be scanned was calculated incorrectly for multi-byte character sets. As a result of this in 4. 1 the the scanned range was wider then necessary if the prefix contained not only one-byte characters. In 5.0 additionally it caused missing some rows from the result set. The function my_like_range_mb was fixed to calculate the length of the prefix in a pattern string correctly in all cases.
* | | | | Merge xiphis.org:/home/antony/work2/p4-bug12096.3unknown2006-06-281-6/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/p4-bug12096.3-merge sql/mysqld.cc: Auto merged
| * \ \ \ \ Merge xiphis.org:/home/antony/work2/p4-bug12096.2unknown2006-06-221-6/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/p4-bug12096.3 configure.in: Auto merged sql/mysqld.cc: Auto merged strings/Makefile.am: Auto merged
| | * | | | Bug#12096unknown2006-05-311-6/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Add line for non-executable stack in .s files" Fix so that configure will use "--noexecstack" for assembler if gcc supports option and compiled C doesn't need executable stack. config/ac-macros/compiler_flag.m4: Bug#12096 Add macro to check if "--noexecstack" should be used when compiling assembler configure.in: Bug#12096 Add macro to check if "--noexecstack" should be used when compiling assembler strings/Makefile.am: Bug#12096 Automake knows how to handle assembler
* | | | | Merge mysql.com:/opt/local/work/tmp_mergeunknown2006-06-261-8/+12
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.1-runtime mysql-test/r/sp-prelocking.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/sp.test: Auto merged sql/sp_head.cc: Auto merged sql/sql_parse.cc: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged strings/ctype-mb.c: Auto merged mysql-test/t/sp-prelocking.test: Manual merge.
| * | | | Bug#15811: extremely long time for mysql client to execute long INSERTunknown2006-06-221-8/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was in redundant calls to strlen() in string functions, where we may then return after checking only the small number of characters. No test case is provided since it's a performance fix. strings/ctype-mb.c: Do not use strlen() where arbitrary horizon of at least CHARSET_INFO::mbmaxlen character is sufficient.
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-06-221-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1 mysql-test/extra/rpl_tests/rpl_log.test: Auto merged mysql-test/r/rpl_ndb_log.result: Auto merged mysql-test/r/rpl_row_log.result: Auto merged mysql-test/r/rpl_row_log_innodb.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/log_event.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/mysql_priv.h: SCCS merged
| * | | unsigned char -> ucharunknown2006-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing copyright Indentation and prototype fixes Fixed compiler warning include/my_sys.h: Fix prototype for my_print_open_files. Indentation fixes mysys/mf_keycache.c: Fix that key cache can be compiled without #define THREAD mysys/my_error.c: Indentation cleanups mysys/my_memmem.c: Added missing copyright. Fix include files sql/event.cc: unsigned char -> uchar sql/field.cc: unsigned char -> uchar sql/filesort.cc: Indentation fix sql/ha_ndbcluster.cc: unsigned char -> uchar sql/ha_ndbcluster_binlog.cc: unsigned char -> uchar sql/item_strfunc.cc: unsigned char -> uchar sql/log_event.cc: unsigned char -> uchar sql/opt_range.cc: Indentation fixes sql/sql_crypt.cc: unsigned char -> uchar sql/sql_string.cc: unsigned char -> uchar sql/tztime.cc: unsigned char -> uchar storage/heap/hp_extra.c: Clear also next_block (See heap_scan_init) storage/heap/hp_test2.c: Set required struct memeber max_table_size (Fixes that hp_test2 works again) storage/myisam/mi_rsamepos.c: Fixed bug in mi_rsame_with_pos strings/decimal.c: Fixed compiler warning
* | | | Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18201unknown2006-06-191-8/+19
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-kt mysql-test/r/xml.result: Auto merged mysql-test/t/xml.test: Auto merged sql/item_xmlfunc.cc: Auto merged
| * | | Merge mysql.com:/usr/home/bar/mysql-5.1-newunknown2006-05-021-8/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b18201 mysql-test/r/xml.result: Auto merged mysql-test/t/xml.test: Auto merged sql/item_xmlfunc.cc: Auto merged
| | * | | Bug#18201: XML: ExtractValue works even if the xmlunknown2006-04-171-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fragment is not well-formed xml Problem: - ExtractValue silently returned NULL if a wrong XML value is passed. - In some cases "unexpected END-OF-INPUT" error was not detected, and a non-NULL result could be returned for a bad XML value. Fix: - Adding warning messages, to make user aware why NULL was returned. - Missing "unexpected END-OF-INPUT" error is reported now. mysql-test/r/xml.result: - Fixing XML systax error in old test - Adding test cases. mysql-test/t/xml.test: - Fixing XML systax error in old test - Adding test cases. sql/item_xmlfunc.cc: Produce warning in case of XML systax error, instead of silentrly returning NULL. strings/xml.c: - Making error messages better looking and clearer: It is important because now they're seen in SHOW WARNINGS (previously they were used only for debugging purposes). - Adding "unexpected END-OF-INPUT" error if after scanning closing tag for the root element some input is left (previously this error was ignored in a mistake).
* | | | | Rename cmakelists.txt -> CMakeLists.txtunknown2006-05-121-1/+1
| | | | |
* | | | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ↵unknown2006-05-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mixed case filenames since this seems to be required with Cmake 2.4 beta 1. This is being pushed to a private tree and tested before being sent to the mainline. client/CMakeLists.txt: Rename: client/cmakelists.txt.tmp -> client/CMakeLists.txt libmysql/CMakeLists.txt: Rename: libmysql/cmakelists.txt.tmp -> libmysql/CMakeLists.txt libmysqld/CMakeLists.txt: Rename: libmysqld/cmakelists.txt.tmp -> libmysqld/CMakeLists.txt sql/CMakeLists.txt: Rename: sql/cmakelists.txt.tmp -> sql/CMakeLists.txt zlib/CMakeLists.txt: Rename: zlib/cmakelists.txt.tmp -> zlib/CMakeLists.txt extra/CMakeLists.txt: Rename: extra/cmakelists.txt.tmp -> extra/CMakeLists.txt tests/CMakeLists.txt: Rename: tests/cmakelists.txt.tmp -> tests/CMakeLists.txt extra/yassl/CMakeLists.txt: Rename: extra/yassl/cmakelists.txt.tmp -> extra/yassl/CMakeLists.txt extra/yassl/taocrypt/CMakeLists.txt: Rename: extra/yassl/taocrypt/cmakelists.txt.tmp -> extra/yassl/taocrypt/CMakeLists.txt storage/heap/CMakeLists.txt: Rename: storage/heap/cmakelists.txt.tmp -> storage/heap/CMakeLists.txt storage/myisam/CMakeLists.txt: Rename: storage/myisam/cmakelists.txt.tmp -> storage/myisam/CMakeLists.txt storage/myisammrg/CMakeLists.txt: Rename: storage/myisammrg/cmakelists.txt.tmp -> storage/myisammrg/CMakeLists.txt storage/csv/CMakeLists.txt: Rename: storage/csv/cmakelists.txt.tmp -> storage/csv/CMakeLists.txt storage/innobase/CMakeLists.txt: Rename: storage/innobase/cmakelists.txt.tmp -> storage/innobase/CMakeLists.txt server-tools/instance-manager/CMakeLists.txt: Rename: server-tools/instance-manager/cmakelists.txt.tmp -> server-tools/instance-manager/CMakeLists.txt libmysqld/examples/CMakeLists.txt: Rename: libmysqld/examples/cmakelists.txt.tmp -> libmysqld/examples/CMakeLists.txt vio/CMakeLists.txt: Rename: vio/cmakelists.txt.tmp -> vio/CMakeLists.txt dbug/CMakeLists.txt: Rename: dbug/cmakelists.txt.tmp -> dbug/CMakeLists.txt strings/CMakeLists.txt: Rename: strings/cmakelists.txt.tmp -> strings/CMakeLists.txt regex/CMakeLists.txt: Rename: regex/cmakelists.txt.tmp -> regex/CMakeLists.txt mysys/CMakeLists.txt: Rename: mysys/cmakelists.txt.tmp -> mysys/CMakeLists.txt storage/archive/CMakeLists.txt: Rename: storage/archive/cmakelists.txt.tmp -> storage/archive/CMakeLists.txt storage/bdb/CMakeLists.txt: Rename: storage/bdb/cmakelists.txt.tmp -> storage/bdb/CMakeLists.txt storage/blackhole/CMakeLists.txt: Rename: storage/blackhole/cmakelists.txt.tmp -> storage/blackhole/CMakeLists.txt storage/example/CMakeLists.txt: Rename: storage/example/cmakelists.txt.tmp -> storage/example/CMakeLists.txt CMakeLists.txt: Rename: cmakelists.txt.tmp -> CMakeLists.txt
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-05-021-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
| * \ \ \ \ Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667unknown2006-05-021-1/+12
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667 include/my_sys.h: Auto merged mysys/Makefile.am: Auto merged tests/Makefile.am: Auto merged
| | * | | An update to as-yet unused new feature of snprintf, which was added to bring unknown2006-05-021-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our sprintf()-alike in sync with our fprintf()-alike features. strings/my_vsnprintf.c: Advance the destination pointer properly. Also, pay attention to the "n" in snprintf() -- never write too much.
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-011-1/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667 mysys/Makefile.am: Auto merged sql/sql_parse.cc: Auto merged
| | | * | | SECURITY FIXunknown2006-05-011-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#17667: An attacker has the opportunity to bypass query logging. This adds a new, local-only printf format specifier to our *printf functions that allows us to print known-size buffers that must not be interpreted as NUL-terminated "strings." It uses this format-specifier to print to the log, thus fixing this problem. include/my_sys.h: Add prototype for my_memmem() . mysys/Makefile.am: Add reference to new file, my_memmem.c mysys/mf_iocache2.c: Add a "%.1234b" and "%.*b" percent-code. It takes a width, just like "%s", but unlike the string-indicator, it requires the width and doesn't stop printing at NUL characters. Also, simplify the code a bit. TODO: This code should be unified with the strings/my_vnsprintf.c code in the future. sql/sql_parse.cc: The query is not a C-string, but is a sized buffer, containing any character at all, which may include NUL characters. strings/my_vsnprintf.c: Add a "%.1234b" and "%.*b" percent-code. It takes a width, just like "%s", but unlike the string-indicator, it requires the width and doesn't stop printing at NUL characters. tests/Makefile.am: We may need some of our local functions. tests/mysql_client_test.c: Add a "%.1234b" and "%.*b" percent-code. It takes a width, just like "%s", but unlike the string-indicator, it requires the width and doesn't stop printing at NUL characters. mysql-test/t/mysql_client_test.opt: New BitKeeper file ``mysql-test/t/mysql_client_test.opt'' Add '--log' server parameter. mysys/my_memmem.c: New BitKeeper file ``mysys/my_memmem.c'' Implement memmem, a black-box work-alike of the GNU memmem(), which functions like strstr() but for arbitrary blocks of memory.
| | * | | | ctype-extra.c:unknown2006-04-061-0/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using local. strings/ctype-extra.c: Using local.
| | * | | | Merge mysql.com:/usr/home/bar/mysql-4.1unknown2006-04-061-244/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0 strings/conf_to_src.c: Auto merged
| | | * | | conf_to_src.c:unknown2006-04-062-55/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backporting a 5.0 change: MAX_BUF was too small for Index.xml Changeing MAX_BUF and adding assert to easier catch the same problem in the future. ctype-extra.c: Regenerating ctype-extra.c with the fixed conf_to_src. strings/ctype-extra.c: Regenerating ctype-extra.c with the fixed conf_to_src. strings/conf_to_src.c: Backporting a 5.0 change: MAX_BUF was too small for Index.xml Changeing MAX_BUF and adding assert to easier catch the same problem in the future.
* | | | | | Fix spelling in comments as requested by Oskuunknown2006-05-021-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make charset code easier to understand include/m_ctype.h: Fix spelling in comments mysql-test/t/cast.test: Fix spelling in comments mysql-test/t/query_cache.test: Fix spelling in comments sql/sql_string.cc: Fix spelling in comments strings/CHARSET_INFO.txt: Fix spelling in comments
* | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2006-04-191-0/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1 include/my_sys.h: Auto merged sql/sql_table.cc: Auto merged mysys/my_access.c: SCCS merged
View Lorry Controller Status