mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18901 commits 2784 branches 343 tags 1.6 GiB
Commit graph

5271 commits

Author SHA1 Message Date
bar@mysql.com
efe6ea9363 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 22:30:28 +04:00
bar@mysql.com
4438d2d569 ps_7ndb.result, ps_6bdb.result: 
after merge clean-up
 2005-01-18 22:29:21 +04:00
jani@ua141d10.elisa.omakaista.fi
04ee95729c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-01-18 20:17:24 +02:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0 Added possibility to use --error <name> instead of --error <number> 
The old syntax works as well. WL#2356.
 2005-01-18 20:16:21 +02:00
bar@mysql.com
05204a9b3c After-merge clean-up 2005-01-18 22:12:33 +04:00
bar@mysql.com
f93bfe06b3 merge 2005-01-18 21:38:40 +04:00
sergefp@mysql.com
a55f4a5da4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 19:49:00 +03:00
gluh@gluh.mysql.r18.ru
c965dc34cd Fix for bug #7981: SHOW GLOBAL STATUS crashes server 2005-01-18 17:37:45 +03:00
sergefp@mysql.com
d89166cd34 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:46:26 +03:00
bar@mysql.com
8cfe729678 1. Item now uses my_charset_bin by default, 
not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.
 2005-01-18 17:41:06 +04:00
bar@mysql.com
b2dbddc39d Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 10:45:09 +04:00
bar@mysql.com
8f23e90232 #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals 
We should not overwrite res if it is returned from a const item.
 2005-01-18 10:42:29 +04:00
monty@mysql.com
9ad75d8c75 After merge fixes 2005-01-18 05:07:22 +02:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
timour@mysql.com
bb77b2e55f Fix for BUG#7331 merged manually from 4.1. 2005-01-17 17:19:33 +02:00
timour@mysql.com
06fce173c0 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 12:41:59 +02:00
bar@deer.(none)
2933cd3d35 user_var.result: 
after merge fix
 2005-01-17 13:58:16 +04:00
bar@deer.(none)
3b7eb23e6b func_str.result: 
after merge fix
 2005-01-17 13:23:56 +04:00
bar@mysql.com
e7e5e8b1e7 user_var.result, func_str.result, item_strfunc.cc: 
bug#7839 ncorrect collation for char(ascii('a'))
 2005-01-17 10:38:35 +04:00
sergefp@mysql.com
6303ca7efa Fixes in opt_range.cc: ROR plan choice code 
* Removed unused parameters 
 * Fixed several cost calculation errors in ror_intersect_add
 * Better code structure for ror_intersect_add and get_best_ror_intersect
 2005-01-17 00:18:19 +03:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
jimw@mysql.com
65b800736f Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-15 10:14:34 -08:00
jimw@mysql.com
96f0219de8 Update results after merge 2005-01-15 10:14:12 -08:00
dlenev@brandersnatch.localdomain
31d3aabb49 Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly" 
to 5.0 tree (since it was lost during last merge).
 2005-01-15 20:02:46 +03:00
monty@mysql.com
8d616390e9 After merge fixes 
Fix for BIT(X) field as string
 2005-01-15 17:38:43 +02:00
monty@mysql.com
3b0f8cabaf Merge with global tree 2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
a37e91e435 Changed interface for my_strntod() to make it more general and more portable 2005-01-15 12:28:38 +02:00
guilhem@mysql.com
09f36a69b9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-15 10:21:50 +01:00
igor@rurik.mysql.com
cd577f2590 func_gconcat.result, func_gconcat.test: 
Added a test case for bug #7769.
item_sum.h:
  Fixed bug #7769: a crash for queries with group_concat and
  having when the query table was empty.
  The bug was due an unsafe dereferencing.
 2005-01-15 01:05:00 -08:00
jimw@mysql.com
a66f6b79be Merge mysql.com:/home/jimw/my/mysql-5.0-6659 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-14 10:47:21 -08:00
joerg@mysql.com
790ea71b60 Re-enable running the 'client_test' test case during release builds on the platforms (bug#7909). 2005-01-14 18:57:50 +01:00
guilhem@mysql.com
5cafbb6838 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 14:23:34 +01:00
bar@mysql.com
71fe5f7e17 Bug#7284: strnxfrm generates different results for equal strings 
additional fix for cp932 and eucjpms, recently implemented by
Shuichi.
 2005-01-14 14:16:56 +04:00
guilhem@mysql.com
980d1b658e Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-14 10:59:37 +01:00
dlenev@mysql.com
8be6787640 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
 2005-01-14 10:09:01 +03:00
jimw@mysql.com
3998da80e9 Output 'MEMORY' as table type for tables using the memory (nee heap) storage 
engine, except when running with sql_mode & MYSQL323. (Bug #6659)
 2005-01-13 17:38:13 -08:00
monty@mysql.com
2204baa5a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-14 00:10:03 +02:00
jimw@mysql.com
444c831e6e Update results files 2005-01-13 13:46:59 -08:00
monty@mysql.com
7c457a1bd7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-01-13 20:09:41 +02:00
jimw@mysql.com
80c56602d3 Merge 2005-01-13 09:31:54 -08:00
jimw@mysql.com
7e1f47022c Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7235 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:24:07 -08:00
jimw@mysql.com
d63dc891c1 Add test cases to verify that SHOW CREATE TABLE always outputs the 
key algorithm for keys where they were explicitly specified.
 2005-01-13 18:22:35 +01:00
jimw@mysql.com
28ee2a67b3 Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-13 09:09:10 -08:00
jimw@mysql.com
7639e5afaf Merge jwinstead2@wwwtst1.mysql.com:mysql-4.1-7774 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-13 09:07:21 -08:00
konstantin@mysql.com
443cafc232 manual merge 2005-01-13 18:15:58 +03:00
guilhem@mysql.com
a02601ecc5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2005-01-13 15:35:36 +01:00
konstantin@mysql.com
a676498977 manual merge 2005-01-13 17:31:49 +03:00
bar@mysql.com
e3d6e6736b bug#7284: strnxfrm returns different results for equal strings 2005-01-13 18:12:04 +04:00
jani@ua141d10.elisa.omakaista.fi
9cea2457ec Fixed a problem with a test. Time could be 0 or 1 seconds, depending 
on whether running with or without valgrind.
 2005-01-13 15:04:57 +02:00