summaryrefslogtreecommitdiff
path: root/strings
Commit message (Collapse)AuthorAgeFilesLines
* Bug #5397: Crash with varchar binary and LIKEunknown2004-09-061-1/+1
|
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1/unknown2004-08-301-157/+166
|\ | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1 sql/mysqld.cc: Auto merged
| * bug in my_strnncoll_utf8 (and friends) fixedunknown2004-08-301-157/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanups better, charset-dependent, ft_max_len_for_sort value myisam/ftdefs.h: better ft_max_len_for_sort value myisam/mi_check.c: better, charset-dependent, ft_max_len_for_sort value myisam/myisamchk.c: unused value from enum removed myisam/sort.c: cleanup sql/mysql_priv.h: cleanup sql/mysqld.cc: cleanup sql/sql_acl.cc: cleanup sql/tztime.cc: cleanup strings/ctype-utf8.c: bug in my_strnncoll_utf8 (and friends) fixed
* | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-08-265-7/+45
|\ \ | |/ |/| | | | | | | | | | | into mysql.com:/M41/mysql-4.1 BitKeeper/etc/logging_ok: auto-union
| * If the system has 64 bit "long", then "long long" does not add newunknown2004-08-265-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality. The existing code takes advantage of this when "typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs. If the compiler then has prototypes for C99 functions 'strtoll()' and 'strtoull()' but no implementation, the existing code in 'strtoull.c' collides with that prototype. These collisions are avoided now. include/m_string.h: Extend the "fake" approach from 'strtoull()' onto 'strtoll()'. strings/strto.c: Ensure that calling file has included necessary headers, as these are needed at the upper level already. strings/strtol.c: Cleanup/alignment with the "long long" functions. strings/strtoll.c: When "long" is 64 bit already, system function 'strtol()' can be used. Header files 'my_global.h' and 'm_string.h' will manage that, if they are included early enough. strings/strtoul.c: Cleanup/alignment with the "long long" functions. strings/strtoull.c: When "long" is 64 bit already, system function 'strtoul()' can be used. Header files 'my_global.h' and 'm_string.h' will manage that, if they are included early enough. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-08-262-19/+27
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 libmysql/libmysql.c: Auto merged mysql-test/r/endspace.result: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-mb.c: Auto merged
| * Portability fixesunknown2004-08-262-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug in end space handle for WHERE text_column="constant" heap/hp_hash.c: Optimzations (no change of logic) libmysql/libmysql.c: Added missing casts (portability fix) myisam/mi_key.c: Changed macro to take arguments and not depend on local variables Simple indentation fixes ? mysql-test/r/connect.result: Added test for setting empty password mysql-test/r/create_select_tmp.result: TYPE -> ENGINE mysql-test/r/ctype_utf8.result: Combine drop's mysql-test/r/endspace.result: Added more tests to test end space behaviour mysql-test/r/having.result: Added missing DROP TABLE mysql-test/r/type_blob.result: Added more tests to ensure that fix for BLOB usage is correct mysql-test/r/type_timestamp.result: Add test from 4.0 mysql-test/t/connect.test: Added test for setting empty password mysql-test/t/create_select_tmp.test: TYPE -> ENGINE mysql-test/t/ctype_utf8.test: Combine drop's mysql-test/t/endspace.test: Added more tests to test end space behaviour mysql-test/t/having.test: Added missing DROP TABLE mysql-test/t/type_blob.test: Added more tests to ensure that fix for BLOB usage is correct mysql-test/t/type_timestamp.test: Add test from 4.0 sql/field.cc: Removed not used variable Portability fix (cast) Simplified Field_str::double() Simple indentation cleanups sql/field.h: Removed not needed class variable sql/item_cmpfunc.cc: Indentation fix sql/item_strfunc.cc: Use on stack variable for Item_str_func::val() instead of str_value. This makes it safe to use str_value inside the Item's val function. Cleaned up LEFT() usage, thanks to the above change sql/item_sum.cc: Indentation cleanups sql/protocol.cc: Added missing cast sql/sql_acl.cc: Indentatin cleanups. Added missing cast Simple optimization of get_sort() sql/sql_select.cc: Don't use 'ref' to search on text field that is not of type BINARY (use 'range' instead). The reson is that for 'ref' we use 'index_next_same' to read the next possible row. For text fields, rows in a ref may not come in order, like for 'x', 'x\t' 'x ' (stored in this order) which causes a search for 'column='x ' to fail sql/tztime.cc: Simple cleanup strings/ctype-bin.c: Comment fixes strings/ctype-mb.c: Changed variable names for arguments
* | ctype-latin1.c:unknown2004-08-261-1/+1
| | | | | | | | | | | | | | | | Revert this change, it was done in a mistake. strings/ctype-latin1.c: Revert this change, it was done in a mistake.
* | A new function to meassure terminal screen cells number for a string.unknown2004-08-2513-2/+253
| |
* | utr11-dump.c:unknown2004-08-251-0/+112
|/ | | | | | | new file
* manually mergedunknown2004-08-241-11/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union mysql-test/r/binary.result: Auto merged mysql-test/r/truncate.result: Auto merged mysql-test/t/binary.test: Auto merged mysql-test/t/truncate.test: Auto merged mysys/my_lib.c: Auto merged strings/my_vsnprintf.c: Auto merged support-files/Makefile.am: Auto merged
* | Bug#4521: unique key prefix interacts poorly with utf8. unknown2004-08-192-15/+150
| | | | | | | | | | | | | | | | | | | | Fix for binary collations for MyISAM and HEAP BTREE. This patch also changes trailing spaces behaviour for binary collations. Binary collations now have PAD characteristic too.
* | after merge fixesunknown2004-08-191-17/+13
| | | | | | | | | | | | | | strings/my_vsnprintf.c: %.#s support in my_vsnprintf BitKeeper/etc/ignore: Added EXCEPTIONS-CLIENT to the ignore list
* | Many files:unknown2004-08-1810-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LIKE crashed mysqld for binary collations in some cases strings/ctype-big5.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-euc_kr.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-gb2312.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-gbk.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-latin1.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-sjis.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-tis620.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-ucs2.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-ujis.c: LIKE crashed mysqld for binary collations in some cases strings/ctype-utf8.c: LIKE crashed mysqld for binary collations in some cases sql/item_cmpfunc.cc: LIKE crashed mysqld for binary collations in some cases
* | Bug#5005 collation cp852_bin makes server crashunknown2004-08-121-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | ctype-simple.c: Check that unicode map was loaded cp852.xml: Missing cp852_bin was added. sql/share/charsets/cp852.xml: Missing cp852_bin was added. strings/ctype-simple.c: Check that unicode map was loaded
* | ctype_uca.test, ctype_uca.result, ctype-uca.c:unknown2004-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Slovak collation didn't work: typo fix in the tailoring rules strings/ctype-uca.c: Slovak collation didn't work: typo fix in the tailoring rules mysql-test/r/ctype_uca.result: Slovak collation didn't work: typo fix in the tailoring rules mysql-test/t/ctype_uca.test: Slovak collation didn't work: typo fix in the tailoring rules
* | Minor fix: V is primary level, not U.unknown2004-07-081-1/+1
| |
* | Adding Roman (classical Latin) collation.unknown2004-07-071-0/+58
| |
* | ctype-uca.c:unknown2004-06-301-14/+14
| | | | | | | | | | | | | | | | mbminlen was wrong for UTF8. strings/ctype-uca.c: mbminlen was wrong for UTF8.
* | ctype-uca.c:unknown2004-06-181-28/+35
| | | | | | | | | | | | | | | | Code optimization to make it look better and work faster. strings/ctype-uca.c: Code optimization to make it look better and work faster.
* | ctype-uca.c:unknown2004-06-181-3/+3
| | | | | | | | | | | | | | | | Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined. strings/ctype-uca.c: Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined.
* | Critical fixes after review:unknown2004-06-161-6/+8
| | | | | | | | | | | | | | | | | | | | - mutex was unlocked before the end of the critical sesion, - Portability issue: It's better to use (*alloc)(x) instead of alloc(x), if alloc is a function passed as an argument. - Use {} around if() block, to avoid possible problems with some Windows compilers.
* | ctype-uca.c:unknown2004-06-151-2/+2
| | | | | | | | | | | | | | | | Compilation failure fix. strings/ctype-uca.c: Compilation failure fix.
* | utf8 contraction fix.unknown2004-06-141-6/+7
| | | | | | | | | | | | | | | | | | Polish collation fix. Slovak collation fix. Testing all language orders.
* | UTF8 UCA based collations.unknown2004-06-142-55/+704
| |
* | Unicode collation algorithm: contraction support.unknown2004-06-1215-25/+304
| | | | | | | | | | | | | | | | E.g. 'Ch' is treated as a separate letter in Czech, not as a combination of C+h.
* | mergedunknown2004-06-1113-37/+96
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: Auto merged include/m_ctype.h: Auto merged sql/sql_parse.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-czech.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-uca.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged
| * | bug#3964 and related issues: FTB problems with charsets where one byte can ↵unknown2004-06-1013-37/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match many correct prefix compare with my_strnncoll include/m_ctype.h: 6th argument to my_strncoll to handle prefix comparison myisam/ft_boolean_search.c: bug#3964 and related issues: problems with charsets where one byte can match many *correct* prefix compare with my_strnncoll *correct* backup of info->lastkey mysql-test/r/fulltext.result: 6th argument to my_strncoll to handle prefix comparison mysql-test/t/fulltext.test: 6th argument to my_strncoll to handle prefix comparison mysys/my_handler.c: 6th argument to my_strncoll to handle prefix comparison sql/sql_parse.cc: cleanup strings/ctype-big5.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-bin.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-czech.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-gbk.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-latin1.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-mb.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-simple.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-sjis.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-tis620.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-uca.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-ucs2.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-utf8.c: 6th argument to my_strncoll to handle prefix comparison strings/ctype-win1250ch.c: 6th argument to my_strncoll to handle prefix comparison
* | | Move UCA language specific definitions into ctype-ucs.c.unknown2004-06-111-1/+333
| | |
* | | Initialize max_sort_char only if a character set is requested.unknown2004-06-119-18/+44
| | |
* | | Allocate memory when a character set is requested:unknown2004-06-1116-5/+587
| | | | | | | | | | | | | | | | | | | | | | | | | | | - For simple character sets: from_uni convertion table. - For UCA: alternative weight arrays. Use mbminlen instead of MY_CS_NONTEXT
* | | assert.h needed for my_dbug.h now is included in my_dbug.h, where it for unknown2004-06-103-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some reason wasn't included before. A lot of files cleaned up from #include <assert.h> client/mysqlbinlog.cc: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. client/mysqldump.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. heap/hp_hash.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. include/m_string.h: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. include/my_dbug.h: include assert.h needed for DBUG_ASSERT libmysql/libmysql.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/ftdefs.h: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_delete.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_dynrec.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_key.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_open.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_search.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. myisam/mi_write.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/mf_iocache.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/mf_iocache2.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/mf_keycache.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_bitmap.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_gethostbyname.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_getopt.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_pthread.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/my_seek.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/rijndael.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. mysys/thr_alarm.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. sql-common/client.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. sql/mysql_priv.h: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. sql/sql_string.cc: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. strings/ctype-simple.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. strings/ctype-ucs2.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before. strings/my_vsnprintf.c: assert.h needed for my_dbug.h now is included in my_dbug.h, where it for some reason wasn't included before.
* | | Optimization to use less memory.unknown2004-06-1015-58/+64
| | |
* | | WL#916: Unicode collations for some languagesunknown2004-06-0815-6/+33
| | |
* | | Bug #3928 regexp [[:>:]] and UTF-8unknown2004-06-071-7/+13
|/ /
* | Fix skipp -> skip once and for all.unknown2004-06-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Note: This affects only comments, not variable names.) extra/perror.c: Fix skipp -> skip once and for all. heap/hp_hash.c: Fix skipp -> skip once and for all. isam/_dynrec.c: Fix skipp -> skip once and for all. isam/isamchk.c: Fix skipp -> skip once and for all. isam/isamlog.c: Fix skipp -> skip once and for all. isam/pack_isam.c: Fix skipp -> skip once and for all. isam/test1.c: Fix skipp -> skip once and for all. merge/mrg_open.c: Fix skipp -> skip once and for all. myisam/mi_check.c: Fix skipp -> skip once and for all. myisam/mi_delete.c: Fix skipp -> skip once and for all. myisam/mi_key.c: Fix skipp -> skip once and for all. myisam/mi_search.c: Fix skipp -> skip once and for all. myisam/myisamlog.c: Fix skipp -> skip once and for all. mysys/ChangeLog: Fix skipp -> skip once and for all. mysys/default.c: Fix skipp -> skip once and for all. mysys/mf_iocache.c: Fix skipp -> skip once and for all. mysys/mf_iocache2.c: Fix skipp -> skip once and for all. mysys/mf_pack.c: Fix skipp -> skip once and for all. mysys/mf_soundex.c: Fix skipp -> skip once and for all. mysys/mf_wfile.c: Fix skipp -> skip once and for all. mysys/my_error.c: Fix skipp -> skip once and for all. mysys/my_getwd.c: Fix skipp -> skip once and for all. scripts/mysql_find_rows.sh: Fix skipp -> skip once and for all. sql/sql_yacc.yy: Fix skipp -> skip once and for all. sql/time.cc: Fix skipp -> skip once and for all. strings/ctype-big5.c: Fix skipp -> skip once and for all. strings/ctype-gbk.c: Fix skipp -> skip once and for all. strings/ctype-tis620.c: Fix skipp -> skip once and for all.
* | Unicode collations: WL#916unknown2004-06-031-2/+51
| | | | | | | | | | | | | | XML and "collation customization" language parsers.
* | Portability fix (using 'char' as argument to C functions may give warnings)unknown2004-05-281-18/+23
| | | | | | | | | | | | | | mysql-test/r/variables.result: update results after merge strings/int2str.c: Portability fix (using 'char' as a parameter may give a warning)
* | Made my_snprintf() behavior snprintf() compatible when printing %x arguments ↵unknown2004-05-274-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (it should produce hex digits in lower case). (fixed version) Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays. Added extra argument to int2str function which controls case of digits you get. Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str() function. Removed unused my_itoa/my_ltoa functions. client/mysql.cc: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. client/mysqladmin.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. dbug/dbug.c: _dig_vec became _dig_vec_upper. include/m_string.h: _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower. my_itoa()/my_ltoa() functions were removed because they were never used in our code. int2str() now has one more argument which controls case of digits it will produce. include/my_global.h: my_itoa()/my_ltoa() functions were removed because they were never used in our code. isam/isamchk.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. libmysql/libmysql.def: _dig_vec is obsoleted by _dig_vec_upper/_dig_vec_lower. myisam/myisamchk.c: Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str() call. mysys/mf_tempfile.c: _dig_vec became _dig_vec_upper. mysys/my_error.c: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. mysys/my_tempnam.c: _dig_vec became _dig_vec_upper. sql-common/client.c: Replaced int2str invocation with radix argument equal to 10 with optimized int10_to_str() call. sql/item_strfunc.cc: _dig_vec became _dig_vec_upper. Also we don't need hex[] array in this file now because we have _dig_vec_lower instead. sql/mysqld.cc: Replaced int2str invocations with radix argument equal to 10 with optimized int10_to_str() call. sql/password.c: _dig_vec became _dig_vec_upper. sql/sql_bitmap.h: _dig_vec became _dig_vec_upper. strings/int2str.c: Replaced _dig_vec by _dig_vec_upper/_dig_vec_lower pair. int2str() now has one more argument which controls case of digits it will produce. my_itoa()/my_ltoa() functions were removed because they were never used in our code. strings/longlong2str-x86.s: _dig_vec became _dig_vec_upper. strings/longlong2str.c: _dig_vec became _dig_vec_upper. strings/my_vsnprintf.c: If my_snprintf() is printing %x argument it should produce lower case hexadecimal digits to be snprintf() compatible.
* | Changed prototype of killed_ptr() to make it more portableunknown2004-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
* | Preparation for user-defined Unicode collations:unknown2004-05-2515-33/+72
| | | | | | | | | | | | | | | | weights data now comes from a static variables but from the charset structure.
* | After merge fixesunknown2004-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove compiler warnings Update windows project files VC++Files/innobase/innobase.dsp: Update project files after merge VC++Files/libmysqld/examples/test_libmysqld.dsp: Update project files after merge VC++Files/libmysqld/libmysqld.dsp: Update project files after merge VC++Files/myisamchk/myisamchk.dsp: Update project files after merge VC++Files/myisamlog/myisamlog.dsp: Update project files after merge VC++Files/myisampack/myisampack.dsp: Update project files after merge VC++Files/mysqldemb/mysqldemb.dsp: Update project files after merge VC++Files/sql/mysqld.dsp: Update project files after merge VC++Files/strings/strings.dsp: Update project files after merge innobase/include/data0data.ic: Fix compiler warning innobase/include/mem0pool.h: Remove reference to not existing variable (after merge fix) innobase/srv/srv0srv.c: Remove reference to not existing variable (after merge fix) libmysqld/libmysqld.def: Add function used by test programs mysql-test/r/func_str.result: After merge fixes mysql-test/r/variables.result: After merge fixes mysql-test/t/variables.test: After merge fixes sql/discover.cc: Remove not used lable sql/opt_range.cc: Removed compiler warnings strings/ctype-tis620.c: After merge fixes
* | Merge with 4.0, mainly to get changes to windows project filesunknown2004-05-201-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/client/mysqladmin.dsp: Auto merged VC++Files/client/mysqldump.dsp: Auto merged VC++Files/client/mysqlimport.dsp: Auto merged VC++Files/client/mysqlshow.dsp: Auto merged VC++Files/dbug/dbug.dsp: Auto merged VC++Files/heap/heap.dsp: Auto merged VC++Files/innobase/innobase.dsp: Auto merged VC++Files/isam/isam.dsp: Auto merged VC++Files/isamchk/isamchk.dsp: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/mysql.dsw: Auto merged BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39: Auto merged VC++Files/libmysqltest/myTest.dsp: Auto merged VC++Files/merge/merge.dsp: Auto merged VC++Files/my_print_defaults/my_print_defaults.dsp: Auto merged VC++Files/myisam/myisam.dsp: Auto merged VC++Files/myisam_ftdump/myisam_ftdump.dsp: Auto merged VC++Files/myisammrg/myisammrg.dsp: Auto merged VC++Files/mysqlbinlog/mysqlbinlog.dsp: Auto merged VC++Files/mysqlcheck/mysqlcheck.dsp: Auto merged VC++Files/mysqlshutdown/mysqlshutdown.dsp: Auto merged VC++Files/mysqlwatch/mysqlwatch.dsp: Auto merged VC++Files/mysys/mysys.dsp: Auto merged VC++Files/pack_isam/pack_isam.dsp: Auto merged VC++Files/perror/perror.dsp: Auto merged VC++Files/regex/regex.dsp: Auto merged VC++Files/replace/replace.dsp: Auto merged VC++Files/test1/test1.dsp: Auto merged VC++Files/thr_test/thr_test.dsp: Auto merged VC++Files/vio/vio.dsp: Auto merged VC++Files/zlib/zlib.dsp: Auto merged extra/my_print_defaults.c: Auto merged include/m_string.h: Auto merged include/mysql_embed.h: Auto merged include/mysql_version.h.in: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0sys.c: Auto merged myisam/myisam_ftdump.c: Auto merged VC++Files/bdb/bdb.dsp: Merge with 4.0 VC++Files/client/mysql.dsp: Merge with 4.0 VC++Files/client/mysqlclient.dsp: Merge with 4.0 VC++Files/comp_err/comp_err.dsp: Merge with 4.0 VC++Files/libmysqld/examples/test_libmysqld.dsp: Merge with 4.0 VC++Files/libmysqld/libmysqld.dsp: Merge with 4.0 VC++Files/myisamchk/myisamchk.dsp: Merge with 4.0 VC++Files/myisamlog/myisamlog.dsp: Merge with 4.0 VC++Files/myisampack/myisampack.dsp: Merge with 4.0 VC++Files/mysqldemb/mysqldemb.dsp: Merge with 4.0 VC++Files/mysqlserver/mysqlserver.dsp: Merge with 4.0 VC++Files/sql/mysqld.dsp: Merge with 4.0 VC++Files/strings/strings.dsp: Merge with 4.0 libmysqld/lib_sql.cc: Merge with 4.0 libmysqld/libmysqld.def: Merge with 4.0 mysql-test/r/func_str.result: Merge with 4.0 mysql-test/r/handler.result: auto mysql-test/r/variables.result: Merge with 4.0 mysql-test/t/func_str.test: auto mysql-test/t/handler.test: auto mysql-test/t/variables.test: Merge with 4.0 scripts/make_win_src_distribution.sh: auto scripts/mysql_install_db.sh: Use original file sql/Makefile.am: Merge with 4.0 sql/ha_innodb.cc: auto sql/item_strfunc.cc: Merge with 4.0 sql/mysql_priv.h: auto sql/mysqld.cc: Merge with 4.0 sql/set_var.cc: Merge with 4.0 sql/slave.cc: auto sql/sql_class.h: auto sql/sql_handler.cc: Merge with 4.0 strings/ctype-tis620.c: Merge with 4.0
| * Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'unknown2004-05-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensured that all projects compile Removed compiler warnings Better setting of server_version variable. Fix that make_win_src_distribution creates the privilege tables. VC++Files/bdb/bdb.dsp: Small, automatic changes VC++Files/client/mysql.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqladmin.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlclient.dsp: Removed files that should only be used with mysql command line client VC++Files/client/mysqldump.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlimport.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/client/mysqlshow.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/comp_err/comp_err.dsp: Automatic changes VC++Files/dbug/dbug.dsp: Automatic changes VC++Files/heap/heap.dsp: automatic changes VC++Files/innobase/innobase.dsp: Automatic changes VC++Files/isam/isam.dsp: Automatic changes VC++Files/isamchk/isamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysql/libmysql.dsp: Automatic changes VC++Files/libmysqld/examples/test_libmysqld.dsp: Add missing files VC++Files/libmysqld/libmysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/libmysqltest/myTest.dsp: Automatic changes VC++Files/merge/merge.dsp: Automatic changes VC++Files/my_print_defaults/my_print_defaults.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisam/myisam.dsp: automatic changes VC++Files/myisam_ftdump/myisam_ftdump.dsp: automatic changes VC++Files/myisamchk/myisamchk.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisamlog/myisamlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisammrg/myisammrg.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/myisampack/myisampack.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysql.dsw: Automatic changes VC++Files/mysqlbinlog/mysqlbinlog.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlcheck/mysqlcheck.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqldemb/mysqldemb.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/mysqlserver/mysqlserver.dsp: Automatic changes VC++Files/mysqlshutdown/mysqlshutdown.dsp: Automatic changes VC++Files/mysqlwatch/mysqlwatch.dsp: Automatic changes VC++Files/mysys/mysys.dsp: Automatic changes VC++Files/pack_isam/pack_isam.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/perror/perror.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/regex/regex.dsp: Automatic changes VC++Files/replace/replace.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/sql/mysqld.dsp: Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt' VC++Files/strings/strings.dsp: Removed duplicate code for strnlen VC++Files/test1/test1.dsp: Automatic changes VC++Files/thr_test/thr_test.dsp: Automatic changes VC++Files/vio/vio.dsp: Automatic changes VC++Files/zlib/contrib/asm386/zlibvc.dsp: Automatic changes VC++Files/zlib/zlib.dsp: Automatic changes extra/my_print_defaults.c: Fixed bug in --verbose include/m_string.h: Portability fix include/mysql_embed.h: Better setting of server_version variable include/mysql_version.h.in: Better license text handling innobase/pars/pars0lex.l: Remove compiler warnings innobase/trx/trx0sys.c: Remove compiler warnings libmysqld/lib_sql.cc: Better setting of server_version variable libmysqld/libmysqld.def: Add functions needed for mysql command line client myisam/myisam_ftdump.c: Remove compiler warnings mysys/sha1.c: Remove compiler warnings scripts/make_win_src_distribution.sh: Safety fix scripts/mysql_install_db.sh: Backport from 4.1 to allow make_win_src_distribution create the privilege tables sql/Makefile.am: Add new file mysqld_suffix.h Remove not used file sql_olap.h sql/ha_innodb.cc: Remove not used variable sql/mysqld.cc: Better setting of server_version variable sql/set_var.cc: Fixed bug when showing lower_case_file_system strings/ctype-tis620.c: Remove compiler warnings
* | Portability fixesunknown2004-05-194-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed wrong number of warnings/duplicates for machines with high-byte-first client/mysql.cc: Remove not used variables client/mysqltest.c: Remove double ; myisam/ft_nlq_search.c: Fix valgrind error (not fatal) myisam/rt_test.c: Portability fix mysql-test/r/rpl_trunc_binlog.result: Portability fix mysql-test/t/rpl_trunc_binlog.test: Portability fix (Column 23 was different on openbsd) sql/sql_insert.cc: Fixed wrong number of warnings/duplicates for machines with high-byte-first strings/ctype-big5.c: Portability fix strings/ctype-gbk.c: Portability fix strings/ctype-mb.c: Portability fix strings/ctype-uca.c: Portability fix tests/client_test.c: Portability fixes
* | compatibility fix for hp-ux 64bit (hpux compiler) and sun 64-bit (sun forte)unknown2004-05-141-7/+7
| |
* | Portability fixesunknown2004-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/mysql_install_db.sh: Portability fix (! is not portable) sql/item_func.cc: Use my_strtoll10() instead of strtoull() sql/repl_failsafe.cc: Use my_strtoll10() instead of strtoull() sql/sql_analyse.cc: Use my_strtoll10() instead of strtoull() sql/sql_yacc.yy: Use my_strtoll10() instead of strtoull() strings/my_strtoll10.c: Fix compiler warnings
* | Don't automaticly generate a new key for a foreign key constraint if there ↵unknown2004-05-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is already a usable key. Prefer not automatic keys before automatic keys. If there is two conf BitKeeper/etc/ignore: added *.d include/my_base.h: Added flag for automaticly generated key mysql-test/r/constraints.result: Update tests after bug fix mysql-test/r/create.result: Update tests after bug fix mysql-test/r/innodb.result: Added test of automatic creation of foreign keys mysql-test/t/innodb.test: Added test of automatic creation of foreign keys mysql-test/t/key_cache.test: Portability fixes (64 BIT os) sql/sql_acl.cc: Indentation fixes sql/sql_class.cc: Fix key comparison to handle prefix and optionally key segments in different order. sql/sql_class.h: Added flag for automaticly generated keys sql/sql_parse.cc: Added flag for automaticly generated keys sql/sql_table.cc: Don't automaticly generate a new key for a foreign key constraint if there is already a usable key. Prefer not automatic keys before automatic keys. If there is two conflicting automatic keys, prefer the longer one. sql/sql_yacc.yy: Added flag for automaticly generated keys strings/strings-x86.s: Portability fix.
* | Use Windows code page 1252 instead of real ISO 8859-1unknown2004-05-113-73/+285
| | | | | | | | | | strings/dump_map.c: Produce better formatted dump.
* | ctype-win1250ch.c, ctype-czech.c:unknown2004-05-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Czech collations were renamed to _cs Index.xml: Czech collation were renamed to _cs sql/share/charsets/Index.xml: Czech collation were renamed to _cs strings/ctype-czech.c: Czech collations were renamed to _cs strings/ctype-win1250ch.c: Czech collations were renamed to _cs