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

556 commits

Author SHA1 Message Date
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
sergefp@mysql.com
3ceb04a5d8 Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0 
* Added Item_ref::set_properties 
 * Item_ref::Item_ref now expects to get in *item either
     NULL - then fix_fields() will be called later  or 
     ptr to Item it will refer to - then an equivalent of fix_fields() call is performed
 2004-12-14 01:07:06 +03:00
sergefp@mysql.com
9ed8cd701b Merging fix for BUG#6976 from 4.0 to 4.1 
The problem in 4.1 was the same as in 4.0 - fix_fields() not called for created Item_ref. 
The fix is similar too - initialize Item_refs in ctor (but don't interfere with cases when 
Item_ref is used by subselects).
 2004-12-13 20:06:06 +03:00
Sinisa@sinisa.nasamreza.org
d7734fd8ac Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-12-10 00:19:52 +02:00
Sinisa@sinisa.nasamreza.org
6772f0a721 A fix for a crashing bug #7101, which occures when the 
expression involving LEFT() function is used in GROUP BY
field.
 2004-12-10 00:17:43 +02:00
dlenev@mysql.com
62a6d9749b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6765
 2004-12-09 13:33:12 +03:00
dlenev@brandersnatch.localdomain
4b0882e0a6 Fix for bug #6765 "Implicit access to time zone description 
tables requires privileges for them if some table or column level grants
present" (with after-review fixes).

We should set SELECT_ACL for implicitly opened tables in 
my_tz_check_n_skip_implicit_tables() to be able to bypass privilege
checking in check_grant(). Also we should exclude those tables from
privilege checking in multi-update.
 2004-12-09 13:31:46 +03:00
bar@mysql.com
248a968581 UCS2 support in ENUM and SET, which also fixes: 
Bug #5174 SHOW CREATE TABLE hangs up if the table contains half-with katakana enum values
UCS2 values are stored in HEX encoding in FRM file
 2004-12-06 20:45:32 +04:00
bell@sanja.is.com.ua
d76db8b999 marge 2004-11-13 19:45:36 +02:00
bell@sanja.is.com.ua
7210195f1e now my_printf_error is not better then my_error, but my_error call is shorter 
used only one implementation of format parser of (printf)
fixed multistatement
 2004-11-13 19:35:51 +02:00
monty@mysql.com
63da075081 Merge with 4.1 to get latest fix to client_test.c 2004-11-12 21:27:52 +02:00
jani@ua141d10.elisa.omakaista.fi
dc66722350 Fixed a function call. 2004-11-12 20:47:41 +02:00
jani@ua141d10.elisa.omakaista.fi
fe0b00985f Merge with 4.0 2004-11-12 20:38:58 +02:00
bell@sanja.is.com.ua
1555469b64 merge 2004-11-12 15:36:31 +02:00
bell@sanja.is.com.ua
31f7811183 post-review fixes 2004-11-12 14:34:00 +02:00
konstantin@mysql.com
e5f4c7a0bd Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
ram@gw.mysql.r18.ru
98df9313c0 A fix (bug #6564: QUOTE(NULL) returns NULL, not the string 'NULL') 2004-11-11 18:20:40 +04:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
bar@mysql.com
6a3b1d443f Many files: 
Allow mixing of different character sets for more SQL functions.
item_func.h:
  Allow mixing of different character sets for more SQL functions..
 2004-11-02 16:02:12 +04:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
bar@mysql.com
7577c8bfc9 A fix according to Monty's request: 
"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert().
 2004-10-29 17:00:39 +05:00
bar@mysql.com
64c59b37f8 item_strfunc.cc: 
Unnecessary code was removed.
 2004-10-29 16:06:51 +05:00
bar@mysql.com
2fc0d7e422 An extra "separator" class member was removed from Item_func_concat_ws. 
args[0] is now used instead.
 2004-10-28 11:43:31 +05:00
monty@mishka.local
57a85986ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.local:/home/my/mysql-4.1
 2004-10-14 18:06:38 +03:00
monty@mishka.local
719c88e38f true,false -> TRUE, FALSE 
Simple fixes/optimization of things discovered during review of new pushed code
 2004-10-14 18:03:46 +03:00
konstantin@mysql.com
703e396b6e A small simplification: perform two actions at once, register a 
change, and perform it (the new Item changes registry).
 2004-10-10 03:10:00 +04:00
konstantin@mysql.com
234c80b689 Deployment of centralized Item change registry, step 2: Item_ref 
doesn't need to have it's own recovery mechanism.
 2004-10-08 19:13:09 +04:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release 
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
 2004-10-06 19:14:33 +03:00
ram@gw.mysql.r18.ru
b3dc9f65b0 A fix (bug #5540: CONCAT function and 'double' type). 2004-09-15 15:13:17 +05:00
ram@gw.mysql.r18.ru
beb5d60a6b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5497
 2004-09-14 13:09:51 +05:00
jani@rhols221.adsl.netsonic.fi
0b3d778691 Merge. 2004-09-13 18:12:44 +03:00
jani@rhols221.adsl.netsonic.fi
fe23df1a2b Added per thread status variables, after review, patch v1.1. 2004-09-13 16:48:01 +03:00
ram@gw.mysql.r18.ru
a3a6b7fa25 A fix (bug #5497: COMPRESS() returns NULL for large strings). 2004-09-13 18:43:59 +05:00
ram@gw.mysql.r18.ru
2488b827de A fix (bug #5498 TRIM fails with LEADING or TRAILING if remstr = str). 2004-09-13 14:25:43 +05:00
monty@mysql.com
49cd04b510 Merge on pull 2004-09-09 07:26:28 +03:00
hf@deer.(none)
bff3ed00f8 Code cleanup 2004-09-07 17:28:26 +05:00
hf@deer.(none)
c0458bb3b6 A set of mysql_home_path-related fixes 2004-09-07 11:55:34 +05:00
bell@sanja.is.com.ua
392c306969 fixed open_and_lock_tables result processing (all open_and_lock_tables revision) 
fixed printing of COLLATE operation
(BUG#5155)
 2004-08-31 10:06:38 +03:00
monty@mysql.com
ea687ba5da Portability fixes 
Fixed bug in end space handle for WHERE text_column="constant"
 2004-08-26 18:26:38 +03:00
bar@mysql.com
8186470b6b ctype_utf8.result, ctype_utf8.test, item_strfunc.cc: 
LEFT() didn't work well in some cases.
 2004-08-13 15:04:10 +05:00
ram@gw.mysql.r18.ru
74c64904c7 A fix (Bug #4878: Service crashes on query execution) 2004-08-12 11:28:39 +05:00
hf@deer.(none)
cbff743b2d Final patch for WL#1600(warn if max_allowed_packet used) 2004-07-21 21:27:45 +05:00
hf@deer.(none)
5bff13bc72 Merging 2004-07-21 19:10:37 +05:00
monty@mysql.com
c1032fe9eb Cleanup of db option cacheing 
Some bug fixes to last pushed code
 2004-07-09 10:55:16 +03:00
serg@serg.mylan
fe57b75079 bug#4441 - crash in UNHEX(NULL) 2004-07-07 23:49:03 +02:00
hf@deer.(none)
eb67909bf4 WL#1600 (Warn if result is truncatet due to max_allowed_packet) 2004-06-29 19:55:13 +05:00
ram@gw.mysql.r18.ru
5647996784 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4035
 2004-06-15 16:03:16 +05:00
ram@gw.mysql.r18.ru
438a7d0162 We don't need tmp_value member in the Item_func_left. 2004-06-15 16:01:43 +05:00
ram@gw.mysql.r18.ru
71eee450e0 a fix 
(Bug #4035 GROUP_CONCAT with HAVING clause truncates field                       
Bug #4057 LEFT() function in HAVING clause truncates query result).
 2004-06-08 18:01:15 +05:00
bar@bar.intranet.mysql.r18.ru
500874b554 Bug #3717 ENCODE returns a character string, not a binary string 2004-06-08 15:36:44 +05:00
gluh@gluh.mysql.r18.ru
d381736c31 Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character 2004-06-07 17:39:17 +04:00
dlenev@brandersnatch.localdomain
03b705ff44 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should 
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
 2004-05-27 17:54:40 +04:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
ram@gw.mysql.r18.ru
e166036894 A fix (bug #3756: ISNULL(QUOTE()) returns 1 for every row after 1st NULL) 2004-05-17 12:47:16 +05:00
monty@mysql.com
6827fe4086 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-05 21:24:45 +03:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
miguel@hegel.local
8d1480f7c5 Windows fixes for VC++ compiler compability 2004-05-05 02:59:17 -03:00
serg@serg.mylan
2bcfab10ea bug#3556 - soundex 2004-04-28 14:19:02 +02:00
bell@sanja.is.com.ua
b7efa3e5f6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
 2004-03-20 13:37:30 +02:00
bell@sanja.is.com.ua
d095d4753e after review changes 2004-03-20 13:36:26 +02:00
bar@bar.intranet.mysql.r18.ru
66631a3c1e Bug #3087 CONCAT_WS makes the server die in case of illegal mix of collations 2004-03-19 12:09:14 +04:00
bell@sanja.is.com.ua
2b45b53066 DBUG_ASSERT(fixed == 1); added to val* 
small optimisation in signed_literal
 2004-03-18 15:14:36 +02:00
hf@deer.(none)
e90c78ceb5 Small fix 2004-03-16 02:04:03 +04:00
hf@deer.(none)
317e89bc49 Fix for valgrind's warning 2004-03-15 16:32:53 +04:00
serg@serg.mylan
ae279eae3b UUID() bug that manifests itself on low-res (<1 us) timers only 
(and not critical at all as it does not result in repeated values)
 2004-03-14 11:50:15 +01:00
ram@gw.mysql.r18.ru
8ffd9a9190 Fix for the bug #3089: SUBSTRING bug when mixed with CONCAT and ORDER BY 2004-03-09 16:52:37 +04:00
serg@serg.mylan
de6d3b8dff UNHEX() function 2004-03-04 23:18:54 +01:00
serg@serg.mylan
a05c54b6c2 my_getsystime() 2004-03-02 22:21:12 +01:00
serg@serg.mylan
6f80635272 minor compress() cleanup 2004-02-28 18:45:27 +01:00
serg@serg.mylan
65077a8a0e fix CHARSET(UUID()) 2004-02-27 23:59:09 +01:00
serg@serg.mylan
2dab006013 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-27 22:38:36 +01:00
serg@serg.mylan
258e5da7ad comment corrected 2004-02-27 22:38:04 +01:00
serg@serg.mylan
ed2e1aa14d my_gethwaddr() for linux/freebsd 
UUID() function
 2004-02-27 20:30:08 +01:00
serg@build.mysql.com
d0b0e5bf77 do not use static array of pastpoints in my_strtod - it is not portable 
(that is, these numbers are converted to doubles by a local OS strtod,
and on different systems they get different values)
 2004-02-27 14:40:08 +01:00
bar@bar.intranet.mysql.r18.ru
4e77123079 Bug 2701: Function CHARSET() inconsistency 
CONVERT3 was removed, it was for test purposes,
and rather harmful.
 2004-02-11 16:53:39 +04:00
monty@mysql.com
06432eac36 Added --compact to mysqlbinlog 
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
 2004-02-09 12:31:03 +01:00
ram@gw.mysql.r18.ru
f231d9826b just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
monty@mysql.com
151b558e21 Mark that strings may change on index only reads (for BDB tables). 
This fixed problem with index reads on character fields with BDB tables. (Bug #2509)
 2004-01-29 15:16:48 +01:00
vva@eagle.mysql.r18.ru
edf7a7b1d9 some ammendments (comments and code style) 2004-01-22 20:20:43 +04:00
serg@serg.mylan
fbf4299b5c Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-01-22 14:46:54 +01:00
serg@serg.mylan
c4a52e4ac4 enforcing coding style to cause an intentional merge conflict with 4.0 2004-01-22 12:55:37 +01:00
vva@eagle.mysql.r18.ru
4a668f95ce added test for bug #2290 "output truncated with ELT when using DISTINCT" 2004-01-21 02:18:51 +04:00
hf@deer.(none)
7dda8c102f Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.1676
 2004-01-19 21:06:27 +04:00
ram@gw.mysql.r18.ru
e289783cf8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2182
 2004-01-19 13:00:51 +04:00
bar@bar.intranet.mysql.r18.ru
55d84200f4 item_strfunc.cc: 
Unnesessary copying was fixed
 2004-01-15 12:12:55 +04:00
bar@bar.intranet.mysql.r18.ru
cc21589839 item_strfunc.cc: 
We don't need to copy if start is 0, we can return the original value.
 2004-01-14 17:26:30 +04:00
bar@bar.intranet.mysql.r18.ru
362d697c9f item_strfunc.cc: 
Comment typo fix
  ,
 2004-01-14 14:02:51 +04:00
bar@bar.intranet.mysql.r18.ru
81f10f9f07 item_strfunc.cc: 
Unnesessary code was removed. Comment was added.
 2004-01-13 17:27:21 +04:00
hf@deer.(none)
4a87597984 Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.1676
 2003-12-30 19:43:53 +04:00
hf@deer.(none)
bfe134b86f Fix for prepared statements 
Here i added Item_*::cleanup() functions,
removed a lot of ~Item_*'s,
added code to restore order_list and group_list
 2003-12-30 14:08:19 +04:00
bar@deer.(none)
b13808d55f logging_ok: 
Logging to logging@openlogging.org accepted
item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed
 2003-12-29 18:45:13 +04:00
ram@gw.mysql.r18.ru
73a36f1997 Fix & test for the bug #2182: lpad returns incorrect result. 2003-12-22 19:00:51 +04:00
monty@mysql.com
031390a9a4 Fixes after merge with 4.0 
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
 2003-12-19 16:25:50 +02:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
monty@mysql.com
f995a5f4aa Fix autoincrement for signed columns (Bug #1366) 
Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test
 2003-12-12 22:26:58 +02:00
konstantin@mysql.com
124c4ca346 cleanup: if there is return from if-part, we don't need else statement 2003-12-10 22:26:31 +03:00
monty@mysql.com
6a95123971 Added checking of return value from my_once_alloc() in charset 
Added checking of return value from malloc() in reg_init()
 2003-12-10 00:00:20 +02:00
gluh@gluh.mysql.r18.ru
d626c313e5 Fix for bug#1944 'Function RPad() sometimes produce unexpected result' 2003-12-04 14:12:01 +04:00
monty@mysql.com
7c6113a39f Merge key cache structures to one 
Fixed compiler warnings (IRIX C compiler and VC++)
 2003-11-20 22:06:25 +02:00
bell@sanja.is.com.ua
d12b287e00 fixed: 
==2761== Thread 10:
==2761== Conditional jump or move depends on uninitialised value(s)
==2761==    at 0x8115FD2: Item_func_uncompressed_length::val_int() (sql_string.h:90)
==2761==    by 0x8105658: Arg_comparator::compare_int() (item_cmpfunc.cc:356)
and
==2761== Thread 10:
==2761== Conditional jump or move depends on uninitialised value(s)
==2761==    at 0x8116101: Item_func_compress::val_str(String*) (sql_string.h:90)
==2761==    by 0x80E9193: Item::save_in_field(Field*, bool) (item.cc:1155)
 2003-11-04 23:04:07 +02:00
monty@narttu.mysql.fi
f763d4c31d Removed some warnings reported by valgrind 
After merge fixes.
Now code compiles, but there is still some valgrind warnings that needs to be fixed
 2003-11-04 14:09:03 +02:00
bell@sanja.is.com.ua
c56e75e2c1 after review fix 2003-11-03 12:28:36 +02:00
bell@sanja.is.com.ua
33346e26af added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor() 
added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274)
 2003-10-30 12:57:26 +02:00
bell@sanja.is.com.ua
934fa2a104 Merge 2003-10-22 20:52:47 +03:00
monty@mashka.mysql.fi
0d34e50f39 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-10-15 22:52:31 +03:00
monty@mashka.mysql.fi
9ef2a83fbe Portability fixes for windows 
After merge fixes
 2003-10-15 22:40:36 +03:00
bell@laptop.sanja.is.com.ua
ddf4d1e529 fixed printability of Items (all items except subselects) 
(SCRUM) (WL#1274)
 2003-10-12 17:56:05 +03:00
serg@serg.mylan
32fed1e877 wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed. 
typo in error message text corrected.
new tests added
 2003-10-12 15:16:45 +02:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
hf@deer.(none)
5f8e7fef27 Merge 2003-09-26 15:40:26 +05:00
hf@deer.(none)
ba8fa76fa2 SCRUM: 
WL#604 Privileges in embedded library
code added to check privileges in embedded library
NO_EMBEDDED_ACCESS_CHECKS macros inserted in code so we can exclude
access-checking parts. Actually we now can exclude these parts from
standalone server as well. Do we need it?
Access checks are disabled in embedded server by default. One should
edit libmysqld/Makefile manually to get this working.
We definitely need the separate configure for embedded server
 2003-09-26 15:33:13 +05:00
bar@bar.mysql.r18.ru
ebbc1dc13e LPAD() and RPAD() are now multibyte-compatible 2003-09-25 17:31:20 +05:00
monty@mishka.mysql.fi
c22c1d8a4d merge 2003-09-24 10:24:56 +03:00
ram@gw.mysql.r18.ru
6312ad254c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
 2003-09-22 11:39:29 +05:00
ram@gw.mysql.r18.ru
50254237de Fix for the bug #1333: COMPRESS(NULL) segfaults. 2003-09-19 12:25:03 +05:00
hf@deer.(none)
e89e3ff753 SCRUM 
embedded library
some dirty places cleaned:

uint removed from mysql.h as Miguel suggested
empty_string renamed as my_empty_string to get rid of name's intersections
using embedded library
 2003-09-18 18:58:02 +05:00
monty@mashka.mysql.fi
f300e3a164 Remove 'extern' references from .cc files 2003-09-13 11:35:29 +03:00
dlenev@mysql.com
1c11077d60 Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with 
their newer DES_ versions.
Provided macros for backward compatibility.
 2003-09-12 22:33:43 +04:00
ram@mysql.r18.ru
44d6102f81 Fix for the bug #1209: SELECT DATABASE(). 2003-09-08 17:30:53 +05:00
serg@serg.mylan
7d2b0a0ce7 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-09-03 15:40:19 +02:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were 
lost.
 2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
serg@serg.mylan
58bdc6f5e1 use crc32() from bundled zlib if system zlib is unavailable 2003-08-21 18:30:43 +02:00
serg@serg.mylan
08d7f298ee fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib 
moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated
 2003-08-21 16:15:06 +02:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
kostja@oak.local
c23975aace Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-08-07 13:29:25 +04:00
bar@bar.mysql.r18.ru
a60acfcfe0 Old style charset() and set_charset() were removed. 2003-08-05 12:52:37 +05:00
kostja@oak.local
50d3291aee manual merge 2003-07-31 17:11:52 +04:00
bar@bar.mysql.r18.ru
c2a7768b56 A new separate error message: Unknown collation 'blablabla' 2003-07-29 17:12:14 +05:00
kostja@oak.local
7dab500b7a Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-07-17 14:55:13 +04:00
bar@bar.mysql.r18.ru
91d93f6f61 ELT passes the first argument in args[0] instead of having a separate Item. 2003-07-15 18:11:49 +05:00
monty@narttu.mysql.fi
4542d142d7 Portability fixes 2003-07-15 13:10:20 +03:00
venu@myvenu.com
f4518cdc31 Merge venu@bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-07-13 09:53:31 -07:00
miguel@hegel.local
0d3a73efb3 Removed unreferenced local variable 2003-07-13 01:20:15 -04:00
venu@myvenu.com
7d094db001 Add the support of 'SUBSTR' function compatible with Oracle and SAPDB (SCRUM #872) 2003-07-11 18:55:03 -07:00
kostja@oak.local
0f28677af6 Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-07-08 12:03:46 +04:00
monty@narttu.mysql.fi
a3fe7c0959 Remove compiler warnings 
Simple cleanup of previous pull
 2003-07-04 23:06:19 +03:00
kostja@oak.local
1d20b23247 Bug fixes for authentication 
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.
 2003-07-04 20:52:04 +04:00
bar@bar.mysql.r18.ru
d209cf70f8 More code was reused 2003-07-04 20:19:07 +05:00
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