Commit graph

724 commits

Author SHA1 Message Date
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
ramil@ram-book.(none)
50579df606 A fix (bug #10404: select 0/0 returns 0). 2005-05-06 13:31:48 +05:00
bar@mysql.com
b93385de8f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0
2005-05-06 11:48:54 +05:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07:00
shuichi@mysql.com
720418fe46 Added cp932 character set 2005-05-05 10:36:17 -07:00
bar@noter.(none)
153b928c10 Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci
We cannot propagate constants with tricky collations.
2005-05-05 21:13:57 +05:00
holyfoot@hf-ibm.(none)
2c8e9df232 A lot of fixes to Precision math
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
joerg@mysql.com
198b6117f9 Proper handling of "utf8-general-cs" clollation: Missing parts in configuration. 2005-04-11 11:12:08 +02:00
joerg@mysql.com
55ee7b9253 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11 2005-04-08 16:04:37 +02:00
joerg@mysql.com
6bd1bea723 Add missing parts for the "Cybozu" custom build, to avoid future manual patches. 2005-04-08 13:56:48 +02:00
bar@mysql.com
b950bc210c ctype-eucjpms.c:
After merge fix.
2005-04-07 16:14:45 +05:00
serg@serg.mylan
5cd866610d after merge fix 2005-04-06 23:12:10 +02:00
serg@serg.mylan
e1e5b97dea manually merged
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
2005-04-06 21:19:20 +02:00
monty@mysql.com
49e721677f Fixed errors descovered by valgrind 2.4
Added suppression file for some valgrind warnings that are not real errors
2005-04-06 17:22:21 +03:00
bar@mysql.com
1c46a02069 Minor clean-ups for the previous commit. 2005-04-06 15:12:44 +05:00
bar@mysql.com
0134a2b286 Adding a new parameter for well_formed_length to
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
bar@mysql.com
856378bdda Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
2005-04-04 18:04:29 +05:00
bar@mysql.com
d9f8b501db ctype_uca.result:
fixing test results accordingly.
ctype-uca.c:
  It appeared that in traditional Spanish collation
  'RR' is not equal to 'R', as Unicode and Mimer state.
  We'll go Oracle and IBM way instead:
  No special rules to 'RR'.
2005-04-04 17:55:12 +05:00
serg@serg.mylan
e5a50e1927 decimal_div bug#9501 2005-03-31 17:46:36 +02:00
ramil@mysql.com
e9dbf09dfc Merge 2005-03-30 17:07:40 +05:00
serg@serg.mylan
2d666071bc typo fixed 2005-03-29 23:03:36 +02:00
bar@mysql.com
6d3f944d80 merge 2005-03-29 17:24:26 +05:00
bar@mysql.com
5085f368f8 ctype-utf8.c, ctype-sjis.c:
Safer and mode readable way.
2005-03-29 16:23:44 +05:00
bar@mysql.com
4a848d3675 ctype-big5.c:
More readable and safer way.
2005-03-29 16:19:31 +05:00
bar@mysql.com
2d1e9862bc Adding Cybozu's patch.
Not active by default.
One need to pass -DHAVE_CYBOZU_COLLATION to 
activate it.
2005-03-29 14:48:47 +05:00
bar@eagle.intranet.mysql.r18.ru
e76019bc42 Merge eagle.intranet.mysql.r18.ru:/home/bar/mysql-4.1
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
2005-03-25 16:23:16 +04:00
bar@mysql.com
70abf0a046 Allow inserting of extra HKSCS and cp950 characters into a Big5 column. 2005-03-25 16:08:54 +04:00
ramil@mysql.com
00aaa80dbd A fix (bug #9309: Wrong order in INFORMATION_SCHEMA) 2005-03-23 17:39:20 +04:00
konstantin@mysql.com
d5af61b1a0 Rename decimal -> decimal_t, decimal_digit -> decimal_digit_t 2005-03-21 15:58:34 +03:00
dlenev@mysql.com
752a787342 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-03-21 13:28:48 +03:00
konstantin@mysql.com
3e8045c662 Fix a valgrind warning in decimal.c:sanity() 2005-03-21 12:57:42 +03:00
dlenev@mysql.com
ea8adbff36 Manual merge of csets from -build tree into main 5.0 tree. 2005-03-21 11:39:47 +03:00
jimw@mysql.com
ee2b4ec959 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826)
2005-03-18 16:12:25 -08:00