Commit graph

556 commits

Author SHA1 Message Date
bar@mysql.com
a009ec4a9e Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 16:43:47 +05:00
bar@mysql.com
637ec56206 ctype-big5.c:
ctype-cp932.c:
ctype-gbk.c:
ctype-mb.c:
ctype-simple.c:
ctype-sjis.c:
ctype-ucs2.c:
ctype-ujis.c:
ctype-utf8.c:

  Adding explicit cast to return type
  in pointer substructions to avoid
  warnings from some compilers.
2005-07-26 16:38:10 +05:00
bar@mysql.com
daab2160a0 Merge mysql.com:/usr/home/bar/mysql-4.1.b11987
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 21:13:15 +05:00
bar@mysql.com
44a446dc07 ctype-gbk.c:
Bug #11987
  mysql will truncate the text when the text contain GBK char:"0xA3A0" and "0xA1"
  Allow to store and retrieve even unassigned GBK codes.
  Like we did in Big5 earlier.
have_gbk.inc, have_gbk.require, ctype_gbk.result, ctype_gbk.test:
  new file
2005-07-22 21:06:02 +05:00
bar@mysql.com
894dc2fdb0 Merge mysql.com:/usr/home/bar/mysql-4.1.b11754
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-22 14:47:13 +05:00
bar@mysql.com
4d75b059c0 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b11754
2005-07-22 13:27:30 +05:00
gluh@mysql.com
d0086f7db0 Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-07-21 17:55:16 +05:00
bar@mysql.com
6d912fb2ac ctype-latin1.c:
removing extra empty line
  ,
2005-07-21 16:19:08 +05:00
bar@mysql.com
6a97af8a02 Bug#11216: 'show character set' describes latin1 incorrectly
Index.xml:
  Fixing latin1 comment:
  it is actually cp1252, not iso-8859-1
ctype_latin1.result:
  changeing test results accordingly.
ctype-latin1.c:
  Fixed to- and from-Unicode conversion maps
  for better Unicode round trip of undefined
  characters.
2005-07-21 16:05:19 +05:00
bar@mysql.com
b11e78381a ctype-cp932.c:
After backporting from 5.0 fix.
  There is no an extra argument in 4.1.
2005-07-21 13:10:27 +05:00
bar@mysql.com
8724c21bb3 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0
2005-07-20 13:40:18 +05:00
bar@mysql.com
53478eb07f ctype_utf8.result, ctype_utf8.test:
added test case
ctype-utf8.c:
  bug#11754: SET NAMES utf8 followed by SELECT "A\\" LIKE "A\\" returns 0
2005-07-19 16:48:12 +05:00
shuichi@mysql.com
8e60817dda Fixed the ucs2 -> eucjpms conversion bug (bug#11717) 2005-07-18 13:38:56 -07:00
hf@deer.(none)
ba559d651e Fix for bug #11557 (Error during rounding of the DEFAULT values) 2005-07-12 14:17:59 +05:00
hf@deer.(none)
bf7515c302 Fix for bug #10891 (string->decimal conversion crashes server) 2005-07-07 18:23:30 +05:00
bar@mysql.com
d563de7f86 ctype_innodb_like.inc:
New BitKeeper file ``mysql-test/include/ctype_innodb_like.inc''
Many files:
  bug#11650: LIKE pattern matching using prefix index doesn't return correct result
  min and max values were too long in the case of prefix key.
  Fix my_like_range functions not to exceed prefix length.
ctype_innodb_like.inc:
  new file
2005-07-06 17:16:22 +05:00
kent@mysql.com
8e3b393d5c Merge 2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a Makefile.am:
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
monty@mysql.com
fe30ec9032 manual merge 2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43 Fixes during review of new code
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
2005-07-04 03:42:33 +03:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
bar@mysql.com
46536c3a60 ctype_ucs.result, ctype_ucs.test, ctype_utf8.result, ctype_utf8.test:
Fixing tests accordingly.
ctype-ucs2.c:
  The same fix for UCS2.
ctype-utf8.c:
  Bug #9557
  MyISAM utf8 table crash
  The problem was that my_strnncollsp_xxx could
  return big value in the range 0..0xffff.
  for some constant pairs it could return 32738,
  which is defined as MI_FOUND_WRONG_KEY in
  myisamdef.h. As a result, table considered to
  be crashed. 
  Fix to return -1,0 or 1.
2005-06-28 15:00:22 +05:00
hf@deer.(none)
38aa20d380 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.10632
2005-06-15 19:56:01 +05:00
hf@deer.(none)
f1fb785b12 Fix for bug #10632 (CEILING returns wrong result) 2005-06-15 19:53:40 +05:00
hf@deer.(none)
f7cccd7ea8 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.10337
2005-06-15 19:07:11 +05:00
hf@deer.(none)
971eaa189d Fix for bug #10337 (cast(NULL DECIMAL) crashes the server) 2005-06-15 19:02:35 +05:00
georg@lmy002.wdf.sap.corp
b64e6db5a4 fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
hf@deer.(none)
cc007a5c09 Fix for bug #8482 (Incorrect rounding) 2005-06-09 12:44:44 +05:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
bar@mysql.com
abb2d7aa34 ctype_cp1250_ch.result, ctype_cp1250_ch.test:
Adding test.
ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.
2005-06-06 21:22:23 +05:00
monty@mysql.com
e43cbebc59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-06-06 16:54:56 +03:00
bar@mysql.com
2df945d87b Bug#8610: The ucs2_turkish_ci collation fails with upper('i')
UPPER/LOWER now can return a string with different length.

mi_test1.c:
  Adding new arguments.
Many files:
  Changeing caseup/casedn to return a result with different
  length than argument.
sql_string.h:
  Removing unused method,
mysql_priv.h:
  Removing unused method
2005-06-06 16:54:15 +05:00
monty@mysql.com
a69f432115 Code cleanups during code reviews
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
2005-06-01 16:35:09 +03:00
reggie@mdk10.(none)
c5f68180f4 merged changes from 4.1 2005-05-23 12:55:39 -05:00
reggie@mdk10.(none)
1c0da6110e BUG# 10687: Merge engine fails under Windows
This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.
2005-05-23 12:05:15 -05:00
monty@mysql.com
0b75f6e37b compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
reggie@mdk10.(none)
0e8e44e70d BUG# 10687 - MERGE engine fails under Windows
This patch was submitted by Ingo and it appears to work correctly.
2005-05-19 16:02:14 -05:00
monty@mysql.com
9db45adb60 Merge with 4.1 2005-05-14 18:31:22 +03:00
konstantin@mysql.com
89bd09fed2 Manual merge (again) 2005-05-14 12:38:12 +04:00
monty@mysql.com
b54d7d04bd Fixes during review 2005-05-13 14:04:32 +03:00
bar@noter.(none)
ab41ec313f ctype-big5.c:
additional fix for bug@10493, for sjis
ctype-cp932.c:
  additional fix for bug#10493, for cp932
2005-05-10 17:00:54 +05:00
jani@ibmlab.site
e7c02801a0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ibmlab.site:/home/my/bk/mysql-5.0
2005-05-10 13:34:17 +03:00
bar@noter.(none)
8a5c6502ca bug#10344: some string function fail for UCS2
substr fix
2005-05-10 14:13:58 +05:00
jani@ibmlab.site
0b5cedca79 Fixed Bug#10232: update with subquery, precision math,
another column gets rotten value.
2005-05-10 09:25:25 +03:00
holyfoot@mysql.com
32024bfc43 Merge mysql.com:/home/hf/work/mysql-4.1.ssj
into mysql.com:/home/hf/work/mysql-5.0.clean
2005-05-10 02:59:28 +05:00
holyfoot@hf-ibm.(none)
1851a38b2f Fix for bug #10493 (SJIS fields are not correctly saved) 2005-05-10 02:15:59 +05:00
holyfoot@hf-ibm.(none)
44ad7495bb Fix for bug #9527 (negative zero is a nonsence) 2005-05-07 14:41:00 +05:00
holyfoot@mysql.com
3474ae5aac merging 2005-05-06 20:31:50 +05:00
holyfoot@hf-ibm.(none)
ad863d40fa Fix for bug #10004 (Decimal operation crashes server) 2005-05-06 20:06:25 +05:00
holyfoot@hf-ibm.(none)
5aa0edf34c Trimmed fix for bug #9546 (Crashing with huge decimals) 2005-05-06 19:04:58 +05:00