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
23290 commits 2784 branches 343 tags 1.6 GiB
Commit graph

406 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