mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24910 commits 2781 branches 343 tags 1.6 GiB
Commit graph

436 commits

Author SHA1 Message Date
jimw@mysql.com
49e5636410 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-22 12:35:15 -07:00
jimw@mysql.com
e26a344d19 Fix calculation for length of LPAD() and RPAD() reported to 
client via mysql_fetch_fields(). (Bug #11311)
 2005-07-22 11:46:29 -07:00
jimw@mysql.com
80c1c6b33f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 11:05:49 -07:00
monty@mishka.local
7e83d09ce7 Simple fixes during review of new code 2005-07-19 19:25:05 +03:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review 
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
 2005-07-18 15:33:18 +03:00
bell@sanja.is.com.ua
8aad35f9d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
 2005-07-16 00:17:05 +03:00
bell@sanja.is.com.ua
6114bee47c stop evaluation constant functions in WHERE (BUG#4663) 
correct value of CURRENT_USER() in SP with "security definer" (BUG#7291)
 2005-07-16 00:01:44 +03:00
gluh@eagle.intranet.mysql.r18.ru
acf417a7e6 Post-merge fix 2005-07-13 16:08:14 +05:00
gluh@mysql.com
b0ec1cd84e Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-07-13 16:08:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
672e1f20cb Bug #9854 hex() and out of range handling 
added out of range handling
 2005-07-13 14:23:09 +05:00
lars@mysql.com
6db2602ad0 Merge mysql.com:/home/bkroot/mysql-4.1 
into  mysql.com:/home/bk/mysql-5.0
 2005-07-13 02:13:04 +02:00
jimw@mysql.com
60368919f9 Merge mysql.com:/home/jimw/my/mysql-4.1-11643 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-07-12 09:31:07 -07:00
jimw@mysql.com
de9909faec Fix crash caused by calling DES_ENCRYPT() without the --des-key-file 
option having been passed to the server. (Bug #11643)
 2005-07-07 11:49:44 -07:00
bell@sanja.is.com.ua
bb9a634e5c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-07 09:25:16 +03:00
jimw@mysql.com
f1ac600a7e Merge jwinstead@production.mysql.com:my/mysql-5.0-11045 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-06 16:49:04 -07:00
bell@sanja.is.com.ua
8b71793766 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-07-06 16:59:56 +03:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
bell@sanja.is.com.ua
d3905f3d0e Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
bell@sanja.is.com.ua
0e30eea141 fixed substring() length calculation in case of constant negative argument (BUG#10269) 2005-06-28 21:45:11 +03:00
monty@mishka.local
7398252d02 Portability fixes 
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
 2005-06-27 20:31:00 +03:00
msvensson@neptunus.(none)
85b9ffc4ca Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
jimw@mysql.com
f2b0874f80 Clean up warnings and build problems on Windows. (Bug #11045) 2005-06-18 01:55:42 +02:00
msvensson@neptunus.(none)
daba295db0 BUG#10589: des_encrypt functionality always return NULL 
- Push warnings if des_encrypt or des_descrypt function fails because of out of resources or wrong params.
 - Push warning if des_encrypt or des_decrypt function is used when server is missing support for openssl.
 - Add test func_encrypt_nossl that is tun when the server is missing support for openssl.
 2005-06-17 18:07:46 +02:00
bell@sanja.is.com.ua
a11677026f fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387) 2005-06-17 17:27:47 +03:00
holyfoot@hf-ibm.(none)
ff9951f221 Fix for bug #8429 (FORMAT returns incorrect result) 2005-06-08 15:49:36 +05:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +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
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before* 
'#pragma interface' (that comes with the #include'd header file)
 2005-06-05 19:38:52 +02:00
monty@mysql.com
29fd1f2fd9 Move USE_PRAGMA_IMPLEMENTATION to proper place 
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
 2005-06-03 23:46:03 +03:00
kent@mysql.com
f0fcc54b0c Merge 2005-06-02 04:45:09 +02:00
kent@mysql.com
bd48eed988 tztime.cc: 
Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
 2005-06-02 02:43:32 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
msvensson@neptunus.(none)
83d430353e Add ifdefs to control when "#pragma implementation" should be used 
Added some more ifdefs for "#pragma interface"
 2005-05-26 12:09:14 +02:00
ramil@mysql.com
b06181bccd hf's fix for bug #9060 (FORMAT returns incorrect result) 
we need proper rounding there
 2005-05-20 01:04:08 +05:00
monty@mysql.com
c1b512fad3 Change update_auto_increment to return 1 if get_auto_increment() returned ~(ulonglong) 
This makes it easier to give an error in the handler if there was a problem generating an auto-increment value
 2005-05-18 10:41:35 +03:00
jimw@mysql.com
cde9f56b45 Merge 2005-05-09 11:28:57 -07:00
bar@noter.(none)
c783cb3d7e SUBSTR with negative argument didn't work 
with multi-byte strings, length() instead
of numchars() where used in a mistake.
 2005-05-09 20:55:06 +05: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
gluh@gluh.mysql.r18.ru
b435d6e862 Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03:00
bar@mysql.com
a7b877df78 Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY() 
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for 
debugging purposes.
 2005-03-16 17:44:29 +04:00
bar@mysql.com
c6c887b990 # Bug#8785 Problem with nested concats and 
character set conversion of a string constant.
 2005-03-15 17:15:47 +04:00
igor@rurik.mysql.com
db4ca33f52 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-03-09 16:53:20 -08:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
igor@rurik.mysql.com
4559fb998b func_str.result, func_str.test: 
Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
 2005-03-09 00:15:51 -08:00
joerg@mysql.com
28b65497da Manual merge, no effect on 4.1. 2005-03-08 14:17:57 +01:00
gluh@gluh.mysql.r18.ru
00449b8f9c Fix for bug#8978 : Crash on 'select format ...' 2005-03-07 18:56:18 +03:00
bar@mysql.com
d50d213162 Merge 2005-03-05 18:20:35 +04:00
bar@mysql.com
7e8e033290 type_blob.result, func_system.result, func_str.result, ctype_collate.result: 
fixing test results accordingly.
func_system.test:
  New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
    safe_charset_converter() was added for system constants.
item_strfunc.cc:
  safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
  Bug#8291: Illegal collation mix with USER() function.
  After discussion with PeterG and Serge, a new coercibility
  level for "system constants" was introduced, between
  COERRIBLE and IMPLICIT. Thus:
  SELECT col1 = USER() FROM t1; - is done according to col1 collation.
  SELECT 'string' = USER(); - is done according to USER() collation.
  At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
  Version is a system constant too.
 2005-03-04 14:20:49 +04:00