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

367 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
3fbc765b04 Better arguments format to allow reuse more code 2003-07-04 19:56:32 +05:00
bar@bar.mysql.r18.ru
0c2041cfdf New methods 
Item_func::agg_arg_collations()
  Item_func::arr_arg_collations_for_comparison()
 to aggregate argument collations.
It helps to reuse a lot of code.
 2003-07-04 18:12:23 +05:00
hf@deer.(none)
fd4a1d4e54 Fix for #739 
check for negative count in RPAD added
 2003-07-03 23:24:23 +05:00
hf@deer.(none)
eb7ab936bf Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.628
 2003-07-03 16:50:17 +05:00
bar@bar.mysql.r18.ru
74b74ad5e7 There is no Item->binary() anymore. It was remain from 4.0. 2003-07-02 18:34:43 +05:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1) 
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
 2003-07-01 23:40:59 +04:00
monty@mashka.mysql.fi
9fb7e863ad Optimized old patches 
Don't set field to DEFAULT value when set to NULL
 2003-07-01 14:38:38 +03:00
monty@mashka.mysql.fi
5dab55de73 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-07-01 13:30:55 +03:00
bar@bar.mysql.r18.ru
65335d37ff New messages for 3-adic and N-adic operations 
REPLACE() now processed arguments collations according to standard
 2003-06-26 15:45:04 +05:00
monty@mashka.mysql.fi
7655f05dc2 LEFT JOIN optimization: Change LEFT JOIN to normal join if possible 2003-06-26 05:38:19 +03:00
bar@bar.mysql.r18.ru
c6c4e8b8e1 LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX() 
now process arguments according to standard SQL collation determation
rules.
 2003-06-25 15:07:20 +05:00
bar@bar.mysql.r18.ru
cb4539e8de String comparison functions now use the same DTCollation with 
CONCAT() and other string functions. This allows to reuse a lot
if code and to simplify further development.
 2003-06-24 17:12:07 +05:00
bar@bar.mysql.r18.ru
7371150f2d New class DTCollation (SQL:2003 calls it "declared type collation") 
It's a combination of collation and its derivation (precedence order)
 2003-06-24 15:11:07 +05:00
hf@deer.(none)
b24fd86a91 Fix for bug #628 2003-06-21 20:17:50 +05:00
hf@deer.(none)
27c67fbfe7 Fix for bug #666 (Nice number, yeah?) 2003-06-20 20:04:52 +05:00
lenz@mysql.com
8f4794822f Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2003-06-19 12:19:28 +02:00
lenz@kallisto.local
1908cc62b6 - revert wrong include of zlib.h as zlib is not part of the source 
distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system)
 2003-06-19 12:18:04 +02:00
bar@bar.mysql.r18.ru
ebb88ec6ea LPAD, RPAD, MAKE_SET and EXPORT_SET now works correctly with collations 2003-06-19 13:12:55 +05:00
bar@bar.mysql.r18.ru
69af692a5c These functions now return a result of proper collation: 
BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE
 2003-06-19 11:36:44 +05:00
bar@bar.mysql.r18.ru
5b9db52966 Function INSERT() now works according to coercibility rules 
Test for INSERT() has been added
 2003-06-10 16:41:42 +05:00
bar@bar.mysql.r18.ru
3d08cfecd4 Some more functions work according to coercibility now: 
repeat, reverse, quote, soundex, substring
Test func_str has been extended to check them
 2003-06-10 14:54:03 +05:00
monty@narttu.mysql.fi
7a54334443 Merge with 4.0.13 2003-06-05 17:33:38 +03:00
jani@ua126d19.elisa.omakaista.fi
4b55fbe092 Fixed a bug in concat_ws(), which did not add concat separator 
in case of an empty string. Bug ID 586.
 2003-06-05 15:06:19 +03:00
bar@bar.mysql.r18.ru
1ef8b2e34a LTRIM, RTRIM and TRIM now honors coercibility 
LTRIM, RTRIM and TRIM now work fine with ucs2
 2003-06-03 16:57:14 +05:00
bar@bar.mysql.r18.ru
759214fa41 MY_CS_NONTEXT flag for sprintf() incompatible charsets (ucs2 if the only one now) 
Some default_charset_info were removed
 2003-06-03 14:59:17 +05:00
ram@mysql.r18.ru
a36d4212fc Moved spatial functions to the sql/item_geofunc.cc file. 2003-05-30 15:22:34 +05:00
bar@bar.mysql.r18.ru
8192d169a2 CHARSET_INFO structure reorganization for easier maintainance 2003-05-23 17:45:52 +05:00
bar@bar.mysql.r18.ru
8514caa1da CREATE TABLE t1 SELECT left(_latin2'a',1) didn't work, the charset got lost 
Collation and coercibility tests for string functions
 2003-05-23 11:32:35 +05:00
bar@bar.mysql.r18.ru
ff02bddc1a Automatic conversion into supersets (utf8, ucs2) for comparison in some cases 
USER(), DATABASE() and VERSION() return in utf8 now
 2003-05-23 10:45:46 +05:00
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
monty@mashka.mysql.fi
6aa8929cf3 After merge fixes 
Added initialization of all important global variables
 2003-05-21 21:39:58 +03:00
bar@bar.mysql.r18.ru
5b788e660a A separate, better error message when it's impossible to aggregate strings for some operation 2003-05-20 16:36:59 +05:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
guilhem@mysql.com
da0e28b7d6 Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344), 
new test for this.
 2003-05-13 22:50:28 +02:00
monty@mashka.mysql.fi
4bde719df7 Safety fix to enable RAID in max binaries 
Better fix for format('nan')
Fix for HAVING COUNT(DISTINCT...)
 2003-05-13 10:54:07 +03:00
monty@narttu.mysql.fi
ee8190f293 Merge 2003-05-02 15:22:04 +03:00
pem@mysql.com
8cf4e72923 Fixed bug in Item_func_compress::val_str() on MacOS X (bigendian); the length 
was not properly stored in the buffer.
 2003-04-30 13:10:53 +02:00
Sinisa@sinisa.nasamreza.org
b086445181 merge fix 2003-04-29 14:35:10 +03:00
monty@mashka.mysql.fi
51eed4b48c Fix for openssl on Solaris 
Fix for grant bug with SELECT *
 2003-04-28 10:32:56 +03:00
monty@mashka.mysql.fi
bf6cfd2948 Fix for -fbranch-probabilites (bug 268) 
Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314)
Fix for new bison 1.875
max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211)
Don't show port in SHOW PROCESSLIST for system threads
Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275)
Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when
using many joined tables (Bug 212)
 2003-04-26 20:43:28 +03:00
Sinisa@sinisa.nasamreza.org
5dc8dbea5f merge fix 2003-04-26 15:26:28 +03:00
vva@eagle.mysql.r18.ru
0f33b2f0cb added '.' to end of compressed string 2003-04-24 11:37:55 -04:00
monty@narttu.mysql.fi
f4e2112817 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-04-23 01:46:07 +03:00
vva@eagle.mysql.r18.ru
11666b5281 small compress/uncompress modification after monty's review 2003-04-22 18:41:47 -04:00
monty@narttu.mysql.fi
98240b049f Removed some not used files 
Remove the 'fs' file systems as this is not maintained.
Moved programs from client to tests
 2003-04-22 22:41:59 +03:00
Sinisa@sinisa.nasamreza.org
8902b739e9 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-04-17 13:47:37 +03:00
venu@myvenu.com
077d7e81c8 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading 
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
 2003-04-16 11:49:52 -07:00
Sinisa@sinisa.nasamreza.org
0e76eab9d4 Fix for a NAN problem in FORMAT(...) string function .. 2003-04-14 21:46:24 +03:00
Sinisa@sinisa.nasamreza.org
7791dfeeeb Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-04-14 14:51:52 +03:00
vva@eagle.mysql.r18.ru
02ad1b95e3 Merge 2003-04-10 10:25:21 -04:00
vva@eagle.mysql.r18.ru
950fa7aa8a added compress/uncompress function 2003-04-09 20:50:30 -04:00
Sinisa@sinisa.nasamreza.org
5ca7b274fe fix for a : 
SELECT USER();
 2003-04-09 17:34:06 +03:00
ram@mysql.r18.ru
d29557cb68 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.sp
 2003-04-04 14:10:24 +05:00
ram@mysql.r18.ru
7a856411ec Fixed envelope() function. 2003-04-04 14:09:08 +05:00
monty@narttu.mysql.fi
22075460d8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-04-03 21:19:13 +03:00
monty@narttu.mysql.fi
a7708c7904 Merge with 4.0 2003-04-03 21:19:12 +03:00
ram@mysql.r18.ru
2180fa858b AsWKB() function has been added. 2003-04-03 15:13:14 +05:00
bar@bar.mysql.r18.ru
ffa5f52e2d Better error message 2003-04-01 10:26:36 +05:00
hf@deer.mysql.r18.ru
deca14ebde truncating REPLACE result bug fix 2003-03-30 18:36:01 +05:00
hf@deer.mysql.r18.ru
17176c8330 small addition to fix of truncating in replace 2003-03-28 18:18:22 +04:00
hf@deer.mysql.r18.ru
1dd380fb06 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.rpc
 2003-03-28 05:50:58 +04:00
hf@deer.mysql.r18.ru
5b65745584 Fix of the #173 bug 
(Truncating of Replace result)
 2003-03-26 23:31:42 +04:00
monty@mashka.mysql.fi
3bed7a6131 Merge with 4.0.13 2003-03-26 18:37:38 +02:00
bar@bar.mysql.r18.ru
d277db7f40 item_strfunc.cc: 
Fixed that concat() didn't set character set in val_str
  concat_ws() now honors coercibility
 2003-03-24 20:01:05 +04:00
bar@bar.mysql.r18.ru
9755e44f2e item_strfunc.cc: 
The result didn't return proper collation
 2003-03-24 19:33:44 +04:00
bar@bar.mysql.r18.ru
d37ebc34c2 item_strfunc.cc: 
A bug has been fixed. ELT() didn't honor the second argument.
  Coercibility support has been added.
 2003-03-24 19:23:43 +04:00
guilhem@mysql.com
17537ba797 Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave 
Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.
 2003-03-22 15:22:59 +01:00
bar@bar.mysql.r18.ru
c87303d4a2 All charset related actions have been moved from fix_fields() to fix_length_and_dec() 2003-03-21 17:21:45 +04:00
bar@bar.mysql.r18.ru
3c455e314b Produce an error when arguments are not compatible for CONCAT() 2003-03-19 17:24:46 +04:00
bar@bar.mysql.r18.ru
f63218b39a Getting closer to be more SQL99 in dyadic operations 2003-03-19 15:55:17 +04:00
ram@mysql.r18.ru
031ac2a7b2 SRID support. 
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
 2003-03-18 15:30:32 +04:00
bar@bar.mysql.r18.ru
04db86f22a 2003-03-17 21:56:34 +04:00
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +04:00
bar@bar.mysql.r18.ru
b4c8ecd8bc filesort.cc, sql_analyse.cc, item_func.cc, item_strfunc.cc, field.cc: 
Unnesessary binary() calls have been removed
 2003-03-13 15:34:46 +04:00
bar@bar.mysql.r18.ru
78da2ad7bd SELECT BINARY expr 
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
 2003-03-04 19:53:53 +04:00
bar@bar.mysql.r18.ru
48cdd97866 Strings which appear without charset context, 
like number-to-string-convertion-result, now 
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.

Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.
 2003-03-03 10:53:08 +04:00
bar@bar.mysql.r18.ru
475e64520b New error message for situation like: 
SELECT latin1_expr COLLATE anpther_charset_collation
 2003-03-02 14:05:03 +04:00
bar@bar.mysql.r18.ru
cb6a0a4808 item_strfunc.cc: 
Charset conversion function changes coercibility to IMPLICIT
 2003-02-28 20:25:25 +04:00
bar@bar.mysql.r18.ru
35b01c8e9e sql_yacc.yy: 
_charset cast changes coercibility to implicit
item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT
 2003-02-28 20:20:24 +04:00
bar@bar.mysql.r18.ru
8f90a0329b sql_yacc.yy, item_strfunc.cc: 
Two separate functions charset() and collatio()
item_strfunc.h:
  Two separate functions charset() and collation()
 2003-02-27 16:53:10 +04:00
bar@bar.mysql.r18.ru
32da4054ee item_strfunc.cc: 
Fix
 2003-02-13 13:10:23 +04:00
bar@bar.mysql.r18.ru
58e00848d1 item_strfunc.cc: 
Fix
 2003-02-13 11:21:51 +04:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind 
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
 2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
25de9c19b2 After merge fixes & remove compiler warnings 
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
 2003-02-07 15:47:24 +02:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
bar@bar.mysql.r18.ru
73bd2ad74a Some USE_MB have been removed. 2003-01-31 17:37:28 +04:00
monty@mashka.mysql.fi
9e3fd09305 merge with 3.23.56 to get patches for --lower-case-table-names and 
proper handling of SUM() in some functions.
 2003-01-29 19:22:22 +02:00
bar@bar.mysql.r18.ru
735399a850 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
bell@sanja.is.com.ua
c6beb583f6 fixed functions to be able work with group function as argument 
made bisone 1.75 compatible code
 2003-01-29 10:38:56 +02:00
bar@bar.mysql.r18.ru
b92ed69491 wb_wc and wc_mb now checks length inside 2003-01-27 16:46:03 +04:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows) 
Some changes to the prepared statement protocol to make it easier to use and faster.
 2003-01-21 21:07:59 +02:00
bell@sanja.is.com.ua
372e2130e4 fixed test of cardinality 2003-01-21 13:55:26 +02:00
monty@mashka.mysql.fi
8acc22296c Change client_flag to unsigned long (16 -> 32 bits) to handle more options. 
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
 2003-01-18 16:39:21 +02:00
bar@bar.mysql.r18.ru
4f9d82700d strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
monty@mashka.mysql.fi
22b7e67b0b merge 2003-01-14 14:33:10 +02:00
monty@mashka.mysql.fi
7e9b27eaf5 Updates for multi-byte character sets 
(Note: test 'union' fails, but Sanja promised to fix this)
 2003-01-14 14:28:36 +02:00
ram@mysql.r18.ru
de596e897e Fix for spatial objects 2003-01-13 16:36:04 +04:00
hf@deer.mysql.r18.ru
bd5fa8d60e Fix for the bug about point(subselect(...)) 2003-01-08 19:42:31 +04:00
ram@mysql.r18.ru
8009c16a34 Fix for the QUOTE() function. 2003-01-03 19:46:15 +04:00
peter@mysql.com
61e08cadfb SCRUM password() function changes. 2003-01-02 18:04:02 +03:00
peter@mysql.com
3b425c8ba5 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2003-01-01 20:11:18 +03:00
ram@mysql.r18.ru
aedd600401 Fix for QUOTE() function. 2003-01-01 15:59:35 +04:00
bell@sanja.is.com.ua
c7a02249f5 postreviews fix (SCRUM related) 
reordered Item_row class variables to be sorted by memory size
 2002-12-31 18:39:16 +02:00
bell@sanja.is.com.ua
fe9e139056 postreview fix (SCRUM) 
fixed layout
 2002-12-28 01:01:05 +02:00
peter@mysql.com
6bc97ffaee SCRUM 
Add optional second parameter to password() function. It can be used to force password()
to return fixed values.
 2002-12-27 19:47:23 +03:00
bar@bar.mysql.r18.ru
cb619f3a11 less default_charset_info 2002-12-20 17:57:24 +04:00
hf@deer.mysql.r18.ru
8da6f729d1 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.spa
 2002-12-19 15:34:30 +04:00
bar@bar.mysql.r18.ru
6ac401b550 thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
hf@deer.mysql.r18.ru
05de9d5fa9 Spatial-related fixes 2002-12-18 17:17:35 +04:00
peter@mysql.com
1d920529a8 SCRAM Remove spaces from most changed files. 
This alters not only my code so it looks like I'm not only one adding the spaces.
 2002-12-05 01:14:51 +03:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
bell@sanja.is.com.ua
c1527b6f4c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
 2002-11-28 20:04:09 +02:00
bar@bar.mysql.r18.ru
d2e5a5ddd2 More use of new string->number conversion functions 2002-11-28 11:33:04 +04:00
bell@sanja.is.com.ua
4be2cfd62d merging 2002-11-27 19:31:11 +02:00
monty@mashka.mysql.fi
3d1af24f0f Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-11-25 17:34:51 +02:00
monty@mashka.mysql.fi
4cefc97f65 Fixed CAST( xxx as CHAR) 2002-11-25 17:33:51 +02:00
peter@mysql.com
d2aa1fb8e7 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-11-24 17:35:24 +03:00
peter@mysql.com
925155cf5a Merge.... 2002-11-24 17:26:26 +03:00
peter@mysql.com
35ccfd0b42 SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit 
done for merge with newer version of code.
 2002-11-24 17:07:53 +03:00
bell@sanja.is.com.ua
2eb623a4f0 prevent using references on sum function (except HAVING clouse of current select) and forward references 2002-11-21 11:01:33 +02:00
bell@sanja.is.com.ua
7a9f47759e basic row Items (SCRUM) 2002-11-15 20:32:09 +02:00
bar@bar.mysql.r18.ru
442509acdd USER(), DATABASE() and CHARSET() functions are now UCS2 compatible 
Bug fix in ctype-utf8.c
 2002-11-11 18:43:33 +04:00
bar@bar.mysql.r18.ru
098b974483 For coding convenuence cs->mbmaxlen is now 1 for 8bit charsets 2002-11-11 13:10:39 +04:00
peter@mysql.com
04d140538a Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-11-06 18:51:20 +03:00
bar@bar.mysql.r18.ru
2434be61f8 String->copy() now has a charset arg 2002-11-06 17:43:22 +04:00
bar@bar.mysql.r18.ru
86b633379c Some charset code clean-ups 2002-11-06 17:01:12 +04:00
bar@bar.mysql.r18.ru
9a9e7ce0f4 Item->thd_charset() - returns a default charset which should be used 
to compose strings appeared without charset context, for example,
in convertion from numer into string type.
 2002-11-06 15:49:53 +04:00
peter@mysql.com
cc18dc7291 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-30 18:03:09 +03:00
bar@bar.mysql.r18.ru
b43876b9dd All String->set() now have charset argument 2002-10-30 16:19:43 +04:00
peter@mysql.com
1545cbccd3 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-27 13:13:31 +03:00
bar@bar.mysql.r18.ru
95aef91521 BINARY charset is now used instead of binary_flag 2002-10-25 13:58:32 +05:00
peter@mysql.com
d21402052c One more commit to do the merge of new 4.1 tree 2002-10-06 13:42:16 +04:00
peter@mysql.com
de57e9ba35 Merge mysql.com:/home/pz/mysql/mysql-4.1-root 
into mysql.com:/home/pz/mysql/mysql-4.1
 2002-10-03 22:48:53 +04:00
peter@mysql.com
f3c51eec31 One more commit required to merge second pack of Monty's patches 2002-10-03 22:42:13 +04:00
monty@mashka.mysql.fi
62a26cf891 Update after last merge. Fixes some wrong test results. 2002-10-03 16:54:26 +03:00
peter@mysql.com
66b1435ee2 Merging... 2002-10-03 00:13:08 +04:00
peter@mysql.com
f1155a98a4 Changeset to deal with 4.1 -> 4.0 merge 2002-10-02 23:43:27 +04:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +03:00
monty@mashka.mysql.fi
a748b35ddd merge with work 2002-10-02 13:45:16 +03:00
monty@mashka.mysql.fi
d69250a969 Fixes and code cleanups after merge with 4.0.3 
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
 2002-10-02 13:33:08 +03:00
monty@mashka.mysql.fi
7f55d92637 fixed so that --ssl and --skip-ssl works with the MySQL clients. 
Fixed core dump bug when sending wrong string to AES_DECRYPT()
 2002-09-17 23:46:53 +03:00
bar@bar.mysql.r18.ru
ad91c3b77d Fixed that: 
SELECT * FROM t WHERE (c COLLATE latin1) >'a'
might fail in some cases
 2002-09-13 14:11:06 +05:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3 
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
 2002-08-30 12:40:40 +03:00
monty@hundin.mysql.fi
5aa46cafe3 Updated VC++ dsp files from windows build machine 
Remove some compiler warnings when using VC++
Add InnoDB in normal MySQL binary for windows.
 2002-08-29 18:20:04 +03:00
bar@bar.mysql.r18.ru
dd5382187e Fix that this didn't work as far as sorting for ORDER BY was removed by optimizer: 
SELECT k FROM t1 GROUP BY k COLLATE latin1 ORDER BY k COLLATE latin1_de
 2002-08-26 17:33:44 +05:00
Sinisa@sinisa.nasamreza.org
22bcce253e Adding a necessary functionality to ::store and ::save_in_field 
that will take place properly after pull from 4.0, in order to 
handle conversions from quoted constants to bigint's.
 2002-08-24 14:49:04 +03:00
bar@bar.mysql.r18.ru
faaddbd214 Stupid bug fixes in sql_yacc.cc 
New class Item_func_set_collation()
Fixed that "SELECT CONVERT(expr USING charset) GROUP BY 1" was not working
New COLLATION syntax:  <expr> COLLATE latin1
 2002-08-22 18:12:45 +05:00
monty@hundin.mysql.fi
c99c1fd384 Changed IF(expr, column, NULL) to take type from column 
Fixed some windows portability problems and removed some compiler warnings
 Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
 2002-08-12 03:33:46 +03:00
ram@ram.(none)
deaec7b0e0 QUOTE() code cleanup 2002-08-10 15:13:05 +05:00
ram@ram.(none)
390678905b added NULLs check to the QUOTE() function 2002-08-09 19:36:36 +05:00
ram@ram.(none)
b43eb82b10 QUOTE() func changes according to monty's suggestions 2002-08-09 15:42:38 +05:00
ram@ram.(none)
b7403f3d84 new QUOTE() fuction has been added 2002-08-08 20:25:53 +05:00
monty@mashka.mysql.fi
dddc20d9d1 New SET syntax & system variables. 
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
 2002-07-23 18:31:22 +03:00
bell@sanja.is.com.ua
0c6cb114e2 subselect clean up 
fix after automerge
 2002-07-01 19:06:24 +03:00
bar@gw.udmsearch.izhnet.ru
2e1285f296 Fix 2002-06-27 19:00:49 +05:00
bar@gw.udmsearch.izhnet.ru
a3d8e08695 SELECT DISTINCT CONVERT(field USING charset) now works properly 2002-06-26 18:08:33 +05:00
bar@gw.udmsearch.izhnet.ru
337d46966c Several problems were fixed (mostly BLOB+charset related) 
Fixed that MyISAM were not working properly with non-8bit charsets in some cases
CONVERT() function now works properly
 2002-06-26 16:00:43 +05:00
peter@linux.local
53ea45699b Minor compilation fix 2002-06-22 11:44:46 +04:00
bar@gw.udmsearch.izhnet.ru
c5b8f48cf5 New CHARSET() function 2002-06-20 23:26:04 +05:00
bar@gw.udmsearch.izhnet.ru
44347c5a54 SELECT left(non_default_charset_field,n) GROUP BY 1 
now works more correctly. Still needs fixes.
 2002-06-20 22:52:56 +05:00
monty@hundin.mysql.fi
0d8e13979d Made keyread (key scanning) a key specific attribute. 
This avoids using fulltext keys for table scanning.
This also reverts Sinisa's original fix for this problem.
 2002-06-19 00:22:30 +03:00
peter@linux.local
f85a002c68 Merge 2002-06-14 15:24:22 +04:00
peter@linux.local
d505803728 This is just code style/minor optimizations cleanup changeset 2002-06-14 15:14:30 +04:00
monty@mashka.mysql.fi
b8421d34ec Added the following new privleges: 
SHOW DATABASES
CREATE TEMPORARY TABLE
LOCK TABLES
REPLICATION SLAVE & REPLICATION CLIENT
SUPER
EXECUTE

All scripts & documentation is updated for this change.
Added better error messages for global privileges
 2002-06-12 15:04:18 +03:00
peter@linux.local
89b161d05d This changeset is mostly new version of previous commit modified according 
to Monty's code style and optimization comments
 2002-06-11 13:37:48 +04:00
monty@mashka.mysql.fi
2aecdd1a91 Big code cleanup/review before 4.0.2 release. 
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
 2002-06-11 11:20:31 +03:00
monty@hundin.mysql.fi
ab1a273198 Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1 2002-06-04 11:39:33 +03:00
monty@hundin.mysql.fi
f0b28da6f9 merge with 4.0 2002-06-03 12:59:31 +03:00
monty@hundin.mysql.fi
6e54cc492c Extension of .frm file (not yet ready for push) 2002-06-02 21:22:20 +03:00
bar@gw.udmsearch.izhnet.ru
660844acd6 Changed 003F -> 0000 for undefinite characters in charset.conf 
Charset convertion FROM dynamic charset is now working too
Allow dynamic charsets in CONVERT()
 2002-06-02 21:32:02 +05:00
monty@hundin.mysql.fi
3cfdd984f0 merge 2002-05-19 11:10:06 +03:00
bar@gw.udmsearch.izhnet.ru
196aa19cf6 Now string values are created and filled with charset field 
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
 2002-05-17 16:29:52 +05:00
monty@hundin.mysql.fi
73392ebee1 Fix bug in CONCAT_WS() 
Update of glibc patch from MySQL 4.0
 2002-05-17 10:50:57 +03:00
bar@gw.udmsearch.izhnet.ru
79fb335f32 Fix for AsText() spatial function 2002-04-18 11:53:59 +05:00
monty@hundin.mysql.fi
b5a145d872 merge 2002-04-13 15:34:39 +03:00
monty@tik.mysql.fi
e857f561fd Fix for INET_NTOA(N) when N >= 2^32 2002-04-06 18:47:54 +03:00
monty@hundin.mysql.fi
6e247490dc Merge 2002-04-02 19:46:26 +03:00
monty@hundin.mysql.fi
dfd7f455e4 Fixed help typos in mysql.cc 2002-04-02 17:42:01 +03:00
bar@gw.udmsearch.izhnet.ru
65cf7e6201 item_strfunc.cc: 
Fix for possible bug when string length is more than 64K
 2002-03-29 20:27:53 +04:00
bar@gw.udmsearch.izhnet.ru
648bd2788a Now this syntax works too: CONVERT(string,charset_to,charset_from) 
where charset_to and charset_from are expressions. For example:

CONVERT('test','latin2','cp1250')
 2002-03-29 19:11:06 +04:00
bar@gw.udmsearch.izhnet.ru
ae03ccc403 Charset convertion operator CONVERT( string USING charset) 2002-03-29 18:22:21 +04:00
bar@gw.udmsearch.izhnet.ru
1ebab2be72 Configure.in/Makefile.in charset related things are now earier to maintain 
Fixes in charset related C++ code
 2002-03-19 20:03:10 +04:00
bar@gw.udmsearch.izhnet.ru
f8a5452877 use String->charset instead of default_charset_info 2002-03-14 20:52:48 +04:00
bar@gw.udmsearch.izhnet.ru
b37ce8e769 New ctype functions/macros to support many charsets at a time 2002-03-12 21:37:58 +04:00
bar@gw.udmsearch.izhnet.ru
735b27d578 Added GIS extension 2002-02-22 15:24:42 +04:00
monty@hundin.mysql.fi
1d3e058c4b Added FLUSH DES_KEY_FILE. 
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.
 2001-12-13 15:53:18 +02:00
monty@hundin.mysql.fi
a9120c7bef Fixes for des_crypt functions. 2001-12-13 03:36:36 +02:00
monty@hundin.mysql.fi
87fd219d67 Fixed sleep time in mysql-test-run 
Fixed bug in query cache.
Cleaned up des_crypt code.
 2001-12-13 02:31:19 +02:00
tonu@volk.internalnet
178822672f --des-key-file functinality added 2001-12-10 11:02:26 +02:00
monty@hundin.mysql.fi
b658662ae4 Update copyright 
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
 2001-12-06 14:10:51 +02:00
tonu@volk.internalnet
a0d9711074 des_encrypt()/des_decrypt() are now ASCII protected and pass testsuite 2001-11-26 15:54:33 +02:00
tonu@volk.internalnet
316126bf52 Merge work.mysql.com:/home/bk/mysql-4.0 
into volk.internalnet:/home/tonu/mysql-4.0
 2001-11-09 07:54:22 +02:00
tonu@volk.internalnet
8706dde5c0 des_encrypt()/des_decrypt() work much better now 2001-11-09 07:49:57 +02:00
monty@hundin.mysql.fi
9285b745d6 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2001-11-07 00:14:43 +02:00
monty@hundin.mysql.fi
4c60b41954 Portability fix 
Cleanup typos (like SKIPP -> SKIP)
 2001-11-07 00:13:29 +02:00
tonu@volk.internalnet
b147f169ce des_encrypt(), des_decrypt() functions added. Not finally ready yet, so I will clean it up later. 2001-11-06 22:57:14 +02:00
monty@tik.mysql.fi
e05bf277d6 Final fixes for INSERT into MERGE tables. 
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
 2001-09-27 21:45:48 +03:00
monty@work.mysql.com
447c18954e merge with 3.23.42 2001-09-02 18:38:33 +02:00
monty@hundin.mysql.fi
733f865f54 Fixes for OS2. 
Fix bug in isamlog
Add argument types to function declarations.
 2001-08-22 01:45:07 +03:00