summaryrefslogtreecommitdiff
path: root/strings
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | bug#17870 Table names conflict with Windows device namesunknown2006-04-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was impossible to create some table names on Windows (e.g. LPT1, AUX, COM1, etc). Fixed to pad dangerous names with thee "at" signs (e.g. LPT1@@@, AUX@@@, COM1@@@, and so on). include/my_sys.h: Adding new function declaration mysys/my_access.c: Adding new function check_if_legal_tablename(). It works almost like check_if_legal_filename(), but accepts a table name without extension and path, and does not check "CLOCK$". sql/sql_table.cc: Check if a dangerous table name and append @@@ strings/ctype-utf8.c: Treat "@@@" sequence in a table name as a end-of-line. mysql-test/r/ctype_filename.result: New BitKeeper file ``mysql-test/r/ctype_filename.result'' mysql-test/t/ctype_filename.test: New BitKeeper file ``mysql-test/t/ctype_filename.test''
* | | | | Merge mysql.com:/usr/home/bar/mysql-5.1-newunknown2006-04-111-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b18285 mysql-test/r/xml.result: Auto merged mysql-test/t/xml.test: Auto merged
| * | | | | Bug#18285: ExtractValue not returning character data within <![CDATA[]]> as ↵unknown2006-04-071-0/+22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected mysql-test/r/xml.result: Adding test case mysql-test/t/xml.test: Adding test case strings/xml.c: Adding missing support of CDATA sections.
* | | | | Bug#16233: XML: ExtractValue() fails with special charactersunknown2006-04-111-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExtractValue didn't understand tag and attribute names consisting of "tricky" national letters (e.g. latin accenter letters). It happened because XPath lex parser recognized only basic latin letter a..z ad a part of an identifier. Fixed to recognize all letters by means of new "full ctype" which was added recently. mysql-test/r/xml.result: Adding test case mysql-test/t/xml.test: Adding test case sql/item_xmlfunc.cc: Using recently implemented "true" ctype functionality to treat all national letters as valid tag names, Only basic latin letters worked so far. strings/ctype-simple.c: A bug fix: ctype is array of 257 elements, adding offset to address correct element.
* | | | Merge mysql.com:/usr/home/bar/mysql-5.0unknown2006-04-052-1/+68
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new strings/ctype-extra.c: Auto merged
| * | | conf_to_src.c:unknown2006-04-052-1/+556
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buffer was too small to load Index.xml. So some charsets were not gerenrated. Making the buffer bigger, and adding an DBUG_ASSERT, to easier catch the problem in the future. ctype-extra.c: Additional charsets were generated. strings/ctype-extra.c: Additional charsets were generated. strings/conf_to_src.c: Buffer was too small to load Index.xml. So some charsets were not gerenrated. Making the buffer bigger, and adding an DBUG_ASSERT, to easier catch the problem in the future.
* | | | ctype-extra.c:unknown2006-04-051-0/+702
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recreating ctype-extra.c with additional 5.1 charset, and with additional missing 5.0 charset due to bug with too small buffer MAX_BUF. strings/ctype-extra.c: Recreating ctype-extra.c with additional 5.1 charset, and with additional missing 5.0 charset due to bug with too small buffer MAX_BUF.
* | | | Merge mysql.com:/usr/home/bar/mysql-5.0unknown2006-04-052-45/+7922
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new mysql-test/r/information_schema.result: Auto merged mysql-test/t/information_schema.test: Auto merged sql/item.cc: Auto merged sql/share/charsets/Index.xml: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
| * | | After merge fix for Bug#12076 --with-extra-charsets has no effectunknown2006-04-042-55/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/information_schema.result: IS_COMPILED is not determenistic mysql-test/t/information_schema.test: IS_COMPILED is not determenistic strings/conf_to_src.c: Adding dumping of extra 5.0 fields strings/ctype-extra.c: Recreating sources according to 5.0 XML files using conf_to_src.
| * | | Merge mysql.com:/usr/home/bar/mysql-4.1.12076unknown2006-04-031-44/+7689
| |\ \ \ | | |/ / | | | / | | |/ | |/| | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0 sql/share/charsets/Index.xml: Auto merged strings/ctype-extra.c: SCCS merged
| | * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-04-031-40/+7689
| | |\ | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.12076
| | | * latin1.xml:unknown2005-11-071-40/+7689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing latin1 to cp1252, according to recent changes in ctype-latin1.c. Index.xml: Marking latin1_swedish_ci as "compiled" to avoid its generating into ctype-extra.c. ctype-extra.c: Bug#12076 --with-extra-charsets has no effect All supported dnamic charsets were generated from sql/share/charsets/*.xml under #ifdefs. Compiling is to be activated from "configure" by adding --with-extra-charsets. I'm not including auto-recreating of ctype-extra.c into build process for ease purposes. strings/ctype-extra.c: Bug#12076 --with-extra-charsets has no effect All supported dnamic charsets were generated from sql/share/charsets/*.xml under #ifdefs. Compiling is to be activated from "configure" by adding --with-extra-charsets. I'm not including auto-recreating of ctype-extra.c into build process for ease purposes. sql/share/charsets/Index.xml: Marking latin1_swedish_ci as "compiled" to avoid its generating into ctype-extra.c. sql/share/charsets/latin1.xml: Fixing latin1 to cp1252, according to recent changes in ctype-latin1.c.
| | * | Cleanup during review of new pushed codeunknown2006-03-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_heap.cc: Indentation fixes strings/ctype-ucs2.c: Simplify code tests/mysql_client_test.c: Remove compiler warnings
| | * | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-03-2313-51/+51
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b15376 include/m_ctype.h: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-ucs2.c: Auto merged
* | | | | Add embedded server build to the CMake build files.unknown2006-04-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmakelists.txt: Move configure processing to top-level cmakelists.txt so that it can be shared by mysqld and libmysqld. libmysqld/lib_sql.cc: Temporary #ifdef to allow building from both bitkeeper sources and windows source package. libmysqld/libmysqld.def: Add export missing for test_libmysqld sql/cmakelists.txt: Move configure processing to top-level cmakelists.txt so that it can be shared by mysqld and libmysqld. sql/mysqld.cc: #ifdef out code that is not used, nor compiles, in embedded server. strings/cmakelists.txt: Add some missing sources to fix embedded server build.
* | | | | Manual merge.unknown2006-03-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/mysqld.cc: Auto merged sql/sql_insert.cc: Auto merged
| * | | | | Some changes to make it possible to build for Windows with CMake fromunknown2006-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a normal 'make dist' source .tar.gz. libmysql/mytest.c: bk cp VC++Files/libmysqltest/mytest.c libmysql/mytest.c sql/message.mc: bk cp VC++Files/sql/message.mc sql/message.mc Makefile.am: Add Windows CMake stuff. client/Makefile.am: Add extra files needed for CMake Windows build. cmakelists.txt: Fix subdir order to make CMake dependency calculations happy. configure.in: Add extra files needed for CMake Windows build. extra/Makefile.am: Add extra files needed for CMake Windows build. extra/yassl/Makefile.am: Add extra files needed for CMake Windows build. libmysql/Makefile.am: Add extra files needed for CMake Windows build. libmysql/cmakelists.txt: Move mytest.c to a more sensible location. libmysqld/Makefile.am: Add extra files needed for CMake Windows build. mysys/Makefile.am: Add extra files needed for CMake Windows build. regex/Makefile.am: Add extra files needed for CMake Windows build. server-tools/instance-manager/Makefile.am: Add extra files needed for CMake Windows build. sql/Makefile.am: Add extra files needed for CMake Windows build. sql/cmakelists.txt: Move message.mc to a more sensible location. Add some dependencies to avoid a stale handlerton.cc. storage/archive/Makefile.am: Add extra files needed for CMake Windows build. storage/bdb/Makefile.in: Add extra files needed for CMake Windows build. storage/example/Makefile.am: Add extra files needed for CMake Windows build. storage/heap/Makefile.am: Add extra files needed for CMake Windows build. storage/innobase/Makefile.am: Add extra files needed for CMake Windows build. storage/innobase/include/univ.i: Avoid including Unix config in Windows build. storage/myisam/Makefile.am: Add extra files needed for CMake Windows build. storage/myisammrg/Makefile.am: Add extra files needed for CMake Windows build. strings/Makefile.am: Add extra files needed for CMake Windows build. tests/Makefile.am: Add extra files needed for CMake Windows build. vio/Makefile.am: Add extra files needed for CMake Windows build. zlib/Makefile.am: Add extra files needed for CMake Windows build.
* | | | | | ctype-utf8.c, ctype-simple.c:unknown2006-03-232-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to include into the previous changeset. strings/ctype-simple.c: Forgot to include into the previous changeset. strings/ctype-utf8.c: Forgot to include into the previous changeset.
* | | | | | Merge mysql.com:/usr/home/bar/mysql-5.0unknown2006-03-2314-64/+64
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new mysql-test/r/ctype_ujis.result: Auto merged mysql-test/t/ctype_ujis.test: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-cp932.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-eucjpms.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged include/m_ctype.h: After merge fix.
| * | | | | Bug#15376: Unassigned multibyte codes are converted to U+0000unknown2006-03-232-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mergeing changes into 5.0 mysql-test/r/ctype_eucjpms.result: Adding test mysql-test/r/ctype_ujis.result: After merge fix mysql-test/t/ctype_eucjpms.test: Adding test strings/ctype-cp932.c: After merge fix strings/ctype-eucjpms.c: Applying changes to eucjpms, similar to ujis. Note: eucjpms appeared in 5.0 so the original patch, which was for for 4.1, didn't fix eucjpms.
| * | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.b15376unknown2006-03-2312-48/+48
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0 BitKeeper/deleted/.del-ctype-cp932.c: Auto merged mysql-test/t/ctype_ujis.test: Auto merged sql/sql_string.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-euc_kr.c: Auto merged strings/ctype-gb2312.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-ujis.c: Auto merged strings/ctype-utf8.c: Auto merged include/m_ctype.h: After merge fix. mysql-test/r/ctype_ujis.result: After merge fix
| | * | | | Bug#15375 Unassigned multibyte codes are brokenunknown2005-12-1213-51/+51
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into parts when converting to Unicode. m_ctype.h: Reorganizing mb_wc return codes to be able to return "an unassigned N-byte-long character". sql_string.cc: Adding code to detect and properly handle unassigned characters (i.e. the those character which are correctly formed according to the character specifications, but don't have Unicode mapping). Many files: Fixing conversion function to return new codes. ctype_ujis.test, ctype_gbk.test, ctype_big5.test: Adding a test case. ctype_ujis.result, ctype_gbk.result, ctype_big5.result: Fixing results accordingly. include/m_ctype.h: Reorganizing mb_wc return codes to be able to return "an unassigned N-byte long character". Bug#15375 Unassigned multibyte codes are broken into parts when converting to Unicode. mysql-test/r/ctype_big5.result: Fixing results accordingly. mysql-test/r/ctype_gbk.result: Fixing results accordingly. mysql-test/r/ctype_ujis.result: Fixing results accordingly. mysql-test/t/ctype_big5.test: Adding a test case. mysql-test/t/ctype_gbk.test: Adding a test case. mysql-test/t/ctype_ujis.test: Adding a test case. sql/sql_string.cc: Adding code to detect and properly hanlde unassigned characters (i.e. the those character which are correctly formed according to the character specifications, but don't have Unicode mapping). strings/ctype-big5.c: Fixing conversion function to return new codes. strings/ctype-bin.c: Fixing conversion function to return new codes. strings/ctype-cp932.c: Fixing conversion function to return new codes. strings/ctype-euc_kr.c: Fixing conversion function to return new codes. strings/ctype-gb2312.c: Fixing conversion function to return new codes. strings/ctype-gbk.c: Fixing conversion function to return new codes. strings/ctype-latin1.c: Fixing conversion function to return new codes. strings/ctype-simple.c: Fixing conversion function to return new codes. strings/ctype-sjis.c: Fixing conversion function to return new codes. strings/ctype-tis620.c: Fixing conversion function to return new codes. strings/ctype-ucs2.c: Fixing conversion function to return new codes. strings/ctype-ujis.c: Fixing conversion function to return new codes. strings/ctype-utf8.c: Fixing conversion function to return new codes.
* | | | | Merge mysql.com:/usr/home/bar/mysql-5.0unknown2006-03-231-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new sql-common/client.c: Auto merged
| * | | | ctype-czech.c:unknown2006-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing wrong min_sort_char. strings/ctype-czech.c: Fixing wrong min_sort_char.
* | | | | Merge mysql.com:/usr/home/bar/mysql-5.0unknown2006-03-232-5/+5
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new include/m_ctype.h: Auto merged strings/ctype-bin.c: Auto merged
| * | | Merge mysql.com:/usr/home/bar/mysql-4.1.b17374unknown2006-03-232-5/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0 include/m_ctype.h: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-czech.c: Auto merged
| | * | Bug#17374: select ... like 'A%' operator fails to find value on columuns ↵unknown2006-03-202-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with key Fixed that LIKE worked case insensitively for latin2_czech_cs, which was wrong for a case sensitive collation. include/m_ctype.h: Making my_wildcmp_bin public instead of static strings/ctype-bin.c: Making my_wildcmp_bin public instead of static strings/ctype-czech.c: Use my_wildcmp_bin instead of case insensitive my_wildcmp_8bit mysql-test/include/have_latin2_ch.inc: New BitKeeper file ``mysql-test/include/have_latin2_ch.inc'' mysql-test/r/ctype_latin2_ch.result: New BitKeeper file ``mysql-test/r/ctype_latin2_ch.result'' mysql-test/r/have_latin2_ch.require: New BitKeeper file ``mysql-test/r/have_latin2_ch.require'' mysql-test/t/ctype_latin2_ch.test: New BitKeeper file ``mysql-test/t/ctype_latin2_ch.test''
* | | | Moved cmake scripts into the proper directoriesunknown2006-03-151-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/cmakelists.txt: Rename: sql/sql -> sql/cmakelists.txt zlib/cmakelists.txt: Rename: win/cmakefiles/zlib -> zlib/cmakelists.txt vio/cmakelists.txt: Rename: win/cmakefiles/vio -> vio/cmakelists.txt regex/cmakelists.txt: Rename: win/cmakefiles/regex -> regex/cmakelists.txt mysys/cmakelists.txt: Rename: win/cmakefiles/mysys -> mysys/cmakelists.txt cmakelists.txt: Rename: win/cmakefiles/base -> cmakelists.txt dbug/cmakelists.txt: Rename: win/cmakefiles/dbug -> dbug/cmakelists.txt strings/cmakelists.txt: Rename: win/cmakefiles/strings -> strings/cmakelists.txt libmysql/cmakelists.txt: Rename: win/cmakefiles/libmysql -> libmysql/cmakelists.txt client/cmakelists.txt: Rename: win/cmakefiles/client -> client/cmakelists.txt extra/cmakelists.txt: Rename: win/cmakefiles/extra -> extra/cmakelists.txt tests/cmakelists.txt: Rename: win/cmakefiles/tests -> tests/cmakelists.txt server-tools/instance-manager/cmakelists.txt: Rename: win/cmakefiles/im -> server-tools/instance-manager/cmakelists.txt storage/heap/cmakelists.txt: Rename: win/cmakefiles/heap -> storage/heap/cmakelists.txt storage/myisam/cmakelists.txt: Rename: win/cmakefiles/myisam -> storage/myisam/cmakelists.txt storage/myisammrg/cmakelists.txt: Rename: win/cmakefiles/myisammrg -> storage/myisammrg/cmakelists.txt storage/bdb/cmakelists.txt: Rename: win/cmakefiles/bdb -> storage/bdb/cmakelists.txt storage/innobase/cmakelists.txt: Rename: win/cmakefiles/innobase -> storage/innobase/cmakelists.txt extra/yassl/cmakelists.txt: Rename: win/cmakefiles/yassl -> extra/yassl/cmakelists.txt extra/yassl/taocrypt/cmakelists.txt: Rename: win/cmakefiles/taocrypt -> extra/yassl/taocrypt/cmakelists.txt BitKeeper/deleted/.del-deploy.bat~f6b42340: Delete: win/cmakefiles/deploy.bat
* | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0unknown2006-03-011-0/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1 sql/sql_db.cc: Auto merged strings/decimal.c: Auto merged tests/mysql_client_test.c: Auto merged
| * | | Fix for bug#17602 Server crash on AVG/SUM over DECIMAL column(2nd ver)unknown2006-02-281-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The table may be corrupted and decimal columns may have invalid values in this case. To prevent crash we need to check that decimal column has allowable value. In case of invalid value generate warning and set the value to 0.
* | | | WL#1386 - CTYPE table for unicode character setsunknown2006-02-0217-0/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A prerequisite for several fulltext and XML bugs. MY_CHARSET_HANDLER now has a new function "ctype" to detect a type of the next character in a string (i.e. digit, letter, space, punctuation, control, etc), which now works correctly for both 8bit and multibyte charsets. Previously only 8bit charsets worked correctly, while any multibyte character was considered as letter in multibyte charsets. Many files: Adding new function Makefile.am: Adding build rules for uctypedump, a dump tool to create my_uctype.h using Unicode Character Database file. m_ctype.h: Adding declaration of my_uni_ctype, ctype data for Unicode. Adding new member into MY_CHARSET_HANDLER Makefile.am: Adding my_uctype.h into noinst_HEADERS my_uctype.h, uctypedump.c: new files: ctype data for unicode, and the tool to generate it from a Unicode Character Database file. include/Makefile.am: Adding my_uctype.h include/m_ctype.h: Adding declaration of my_uni_ctype, ctype data for Unicode. strings/Makefile.am: Adding build rules for uctypedump, a dump tool to create my_uctype.h using Unicode Character Database file. strings/ctype-big5.c: Adding new function strings/ctype-bin.c: Adding new function strings/ctype-cp932.c: Adding new function strings/ctype-euc_kr.c: Adding new function strings/ctype-eucjpms.c: Adding new function strings/ctype-gb2312.c: Adding new function strings/ctype-gbk.c: Adding new function strings/ctype-latin1.c: Adding new function strings/ctype-mb.c: Adding new function strings/ctype-simple.c: Adding new function strings/ctype-sjis.c: Adding new function strings/ctype-tis620.c: Adding new function strings/ctype-ucs2.c: Adding new function strings/ctype-ujis.c: Adding new function strings/ctype-utf8.c: Adding new function
View Lorry Controller Status