mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7938 commits 2786 branches 343 tags 1.7 GiB
Commit graph

285 commits

Author SHA1 Message Date
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02:00
Sinisa@sinisa.nasamreza.org
5dc8dbea5f merge fix 2003-04-26 15:26:28 +03:00
Sinisa@sinisa.nasamreza.org
3ca1a152eb Making a better fix for double released pointers and safe 
TMP_TABLE_PARAM.
This involved moving things around in include files.
All tests, including the ones with Valgrind passed.
 2003-04-26 15:12:14 +03:00
guilhem@mysql.com
66e97ba570 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-04-24 17:42:07 +02:00
igor@hundin.mysql.fi
517a287ec9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
 2003-04-24 18:42:06 +03:00
guilhem@mysql.com
b03ec0d7db Replication: new code to not modify in-memory log positions until the COMMIT 
is executed, even if the transaction spans on >=2 relay logs (bug #53).
New variable relay_log_purge =0|1
New test to verify bug #53
 2003-04-24 15:29:25 +02:00
igor@hundin.mysql.fi
80615fade2 Many files: 
Added the MAX_LENGTH_FOR_SORT_DATA option
filesort.cc:
  Added the MAX_LENGTH_FOR_SORT_DATA option
 2003-04-24 14:33:33 +03:00
bar@bar.mysql.r18.ru
6d5f527afd Variable names have been renamed: 
client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection
 2003-04-23 18:19:22 +05:00
bar@bar.mysql.r18.ru
a3d08eaaf9 I renamed system variable literal_collation into connection_collation 2003-04-22 12:27:35 +05:00
pem@mysql.com
64da2fff67 Post post-merge fix. 2003-04-17 00:34:15 +02:00
pem@mysql.com
386b0b91b2 Merged 4.1 into 5.0. 2003-04-16 23:23:23 +02:00
venu@myvenu.com
24d5cd37d2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-04-12 20:07:52 -07:00
hf@deer.mysql.r18.ru
5d4e9f95f2 Merging 2003-04-08 19:43:24 +05:00
hf@deer.mysql.r18.ru
0428d08606 SCRUM 
two KILL versions
code trimming with headquarter's suggestions
 2003-04-08 19:18:33 +05:00
bar@bar.mysql.r18.ru
8cf9ada977 Use of CHARSWT_INFO *result_collation 
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
 2003-04-08 14:38:17 +05:00
bar@bar.mysql.r18.ru
e165845d39 sys_var_collation is now abstract class 
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
 2003-04-07 16:10:27 +05:00
bar@bar.mysql.r18.ru
e0caf3f225 New methods to store strings with "convert to" argimument 2003-04-07 13:52:48 +05:00
venu@myvenu.com
06f075888e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into myvenu.com:/home/venu/work/sql/dev-4.1
 2003-04-04 13:25:53 -05:00
venu@myvenu.com
8eeecd9c86 Fix to support update + bianry logs with prepared statements (Dynamic query) 2003-04-04 12:33:17 -05:00
pem@mysql.com
736e78251e Merging 4.1 to 5.0. 2003-04-04 13:45:35 +02:00
monty@narttu.mysql.fi
4a4838059f Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT) 2003-04-03 21:19:14 +03:00
wax@kishkin.ru
8c0de640e3 resolve new updates group_concat 2003-04-02 19:16:19 +06:00
wax@kishkin.ru
77eb790ec5 SCRUM 
correct sql_alloc, ORDER BY and NULL value in group_concat
add comments
move test msg_arg
add test on NULL
 2003-04-02 17:55:53 +06:00
hf@genie.(none)
0ee0589e93 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into genie.(none):/home/hf/work/mysql-5.0.kil
 2003-03-31 13:42:37 +05:00
hf@genie.(none)
f8f0b70380 SCRUM 
two KILL commands implementation (version 2)
 2003-03-31 13:39:46 +05:00
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
bar@bar.mysql.r18.ru
4532985221 New variable to turn off automatic charset conversion of query results 
Some speed improvements
 2003-03-21 15:18:52 +04:00
hf@genie.(none)
d00b3ba511 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into genie.(none):/home/hf/work/mysql-5.0.kil
 2003-03-21 10:06:04 +04:00
hf@genie.(none)
dd49c33f20 SCRUM 
two versions of KILL implementation
 2003-03-21 09:37:01 +04:00
monty@narttu.mysql.fi
9f200ede0d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-03-20 02:06:08 +02:00
monty@narttu.mysql.fi
48a9c1239c Added support for ULONG division with DIV 
Fixed non fatal memory leak in slave code.
 2003-03-19 21:23:13 +02:00
pem@mysql.com
4a171efd6f Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
bar@bar.mysql.r18.ru
8103c4c537 CONVERT class was removed 2003-03-18 17:01:32 +04:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
monty@narttu.mysql.fi
e7288f279e After merge fixes 
Don't create temporary objects with no table name
 2003-03-17 15:05:04 +02:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
Sinisa@sinisa.nasamreza.org
77eb6e5063 Better fix for "Halloween" effect ... 2003-03-12 17:11:48 +02:00
Sinisa@sinisa.nasamreza.org
40c744a3ac A bug fix for multi-table updates with InnoDB storage engine 2003-03-11 19:40:49 +02:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00
gluh@gluh.mysql.r18.ru
e7f4bf5b27 Added 'PURGE LOGS BEFORE' command 
Added expire-logs-days option
 2003-03-11 13:49:06 +04:00
serg@serg.mysql.com
6897b00216 --new option and local variable to optionally turn on 
"very new functions" - for now 4.1-compatible TIMESTAMT format
 2003-03-05 18:43:56 +01:00
bar@bar.mysql.r18.ru
4ffd74e5de Coercibility is now stored in user vars 2003-03-03 13:16:39 +04:00
pem@mysql.com
8049daf202 Made FUNCTIONs work in insert and select queries, as well as nested function invocations. 
Had to add a cahing mechanism which is in parts an ugly kludge, but it will be
reworked once the real SP caching is implemented.
 2003-03-02 19:17:41 +01:00
bell@sanja.is.com.ua
47b16dae7a posreview changing (SCRUM) 
increased compatibility
postmerge changing
 2003-02-27 20:31:54 +02:00
bar@bar.mysql.r18.ru
2be430da8e sql_class.h: 
New method to simplify access to thd charset
 2003-02-26 14:50:59 +04:00
wax@mysql.com
dd7ecee561 Merge vkishkin@work.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/wax/mysql-4n
 2003-02-24 23:54:58 +05:00
venu@myvenu.com
ee2b888696 Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM 2003-02-20 14:14:37 -08:00
wax@mysql.com
45ada60304 add option default-week-format and variable default_week_format 
(SCRUM)
 2003-02-19 17:05:35 +05:00
pem@mysql.com
97dc6a528e Merging 4.1 into 5.0 2003-02-18 15:05:35 +01:00
bell@sanja.is.com.ua
352a338147 client port number added to SHOW PROCESSLIST (SCRUM?) 2003-02-17 22:07:26 +02:00