mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12971 commits 2784 branches 343 tags 1.6 GiB
Commit graph

12971 commits

This branch
This branch
All branches
Author SHA1 Message Date
guilhem@mysql.com
c846e86d54 Including in enum_shutdown_level the 2 types of KILL of 5.0 
(enum_shutdown_level is going to replace enum killed_state in 5.0).
 2004-06-21 23:04:50 +02:00
guilhem@mysql.com
ff678fd8b7 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-21 16:37:33 +02:00
guilhem@mysql.com
99bc72d9ed changing order of enum_shutdown_level (easier; we can test if we should die with 
"if (thd->killed > thd->killable)", if we simply do
thd->killed= level;
 2004-06-21 16:36:28 +02:00
ram@gw.mysql.r18.ru
d337899571 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.bnew
 2004-06-21 16:53:58 +05:00
tomas@poseidon.elisa-laajakaista.fi
769fb11057 ndb file missing in src dist 2004-06-21 11:24:08 +00:00
ram@gw.mysql.r18.ru
1d3118f1d2 proper test of warnings for group_concat(). 2004-06-21 14:11:51 +05:00
monty@mysql.com
030f091319 Field_geom should have same max_length as Field_blob 
Updated tests
After merge fix
 2004-06-21 11:27:40 +03:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
monty@mysql.com
1388c164bc After merge fixes 
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
 2004-06-21 10:21:20 +03:00
joreland@mysql.com
9ddd3ad5ec Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-06-21 01:20:41 +02:00
joreland@mysql.com
a1c92afabb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-21 01:19:31 +02:00
joreland@mysql.com
5b2d871120 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-06-20 21:01:14 +02:00
konstantin@mysql.com
862a6ed4ca A typo fixed. 2004-06-20 20:27:50 +04:00
joreland@mysql.com
cc3d9c63d7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-06-20 07:28:19 +02:00
konstantin@mysql.com
efba49fd7d Fix for bug in build scripts making everything to be reconfigured 
at each 'make' invocation (pushing as two devs tested that the patch is ok).
 2004-06-20 03:52:05 +04:00
guilhem@mysql.com
c5544563ac swapping lines to make gcc happy 2004-06-19 15:35:41 +02:00
pekka@mysql.com
164878bb6d tux optim 11 - use TUP method to read min/max prefixes 2004-06-19 13:32:15 +02:00
guilhem@mysql.com
6b45c24d39 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-18 23:51:15 +02:00
guilhem@mysql.com
19dbf58eec API change: mysql_shutdown() now requires a 2nd argument, the shutdown level. 
mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.
 2004-06-18 23:50:04 +02:00
paul@ice.snake.net
7997372aa2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-06-18 11:21:50 -05:00
paul@ice.snake.net
29dff96d96 perror.c: 
MySql -> MySQL (Bug #4182)
 2004-06-18 11:19:29 -05:00
pekka@mysql.com
e063f90995 tux optim 10 - use TUP method to read entry keys 2004-06-18 14:42:35 +02:00
pekka@mysql.com
6407710387 tux optim 9 - use TUP method to read search key 2004-06-18 13:46:46 +02:00
joreland@mysql.com
a3bd2cd162 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-18 10:54:00 +02:00
joreland@mysql.com
8aa3117d2f Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-06-18 10:27:37 +02:00
bar@mysql.com
4680a23867 2004-06-18 13:12:47 +05:00
pekka@mysql.com
26d2d453d4 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/space/pekka/ndb/version/my41
 2004-06-18 10:08:12 +02:00
dlenev@brandersnatch.localdomain
b8d665a9a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push
 2004-06-18 11:09:22 +04:00
bar@deer.(none)
24751bf332 configure.in: 
New collations were added.
 2004-06-18 12:09:21 +05:00
ndbdev@ndbmaster.mysql.com
e445902be3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into ndbmaster.mysql.com:/ndb/clone-mysql-4.1-ndb-daily-2004-06-14
 2004-06-18 08:49:03 +02:00
dlenev@brandersnatch.localdomain
e8891ee926 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push
 2004-06-18 10:12:21 +04:00
dlenev@brandersnatch.localdomain
09ba29e539 WL#1264 "Per-thread time zone support infrastructure". 
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
 2004-06-18 10:11:31 +04:00
bar@deer.(none)
92833475e7 ctype-uca.c: 
Code optimization to make it look better and work faster.
 2004-06-18 11:00:51 +05:00
bar@deer.(none)
efc2936e5e ctype-uca.c: 
Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined.
 2004-06-18 10:24:31 +05:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
monty@mysql.com
f56df164f0 ke it possible to use mysys functions in netware/mysql_test_run.c 
Don't pass --user to mysqld if --user is not used
 2004-06-18 04:22:43 +03:00
monty@mysql.com
82a30d38b2 Removed not used file sql_olap.cc 2004-06-18 03:26:28 +03:00
monty@mysql.com
cdddea14e4 Applied patch from Novell (2004-06-03) 2004-06-18 03:23:08 +03:00
konstantin@mysql.com
7bbdb8408b Fix for bug#4105 "Server crash on attempt to prepare a statement with 
character set introducer": add new item type to be returned before from 
Item_param until it's value is set.
This way items like Item_bool_func2 and udf_handler won't treat this item
as constant literal when statement is prepared.
 2004-06-18 04:16:08 +04:00
tomas@mc05.(none)
371423680d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-18 02:16:08 +02:00
tomas@poseidon.bredbandsbolaget.se
25b8f29f11 cannot include my_config.h directly, breaks some makes 2004-06-18 00:16:07 +00:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173) 
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
 2004-06-18 03:02:29 +03:00
monty@mysql.com
6e820c8024 Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 2004-06-18 02:48:01 +03:00
monty@mysql.com
7a046496ba Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-18 02:31:36 +03:00
monty@mysql.com
fd6858dccd Fixed unlikely bug in the range optimzer when using many IN() queries on different key parts. (Bug #4157) 2004-06-18 02:31:11 +03:00
tomas@poseidon.bredbandsbolaget.se
f81f277ed4 mgmapi.cpp: 
hpux make fix
 2004-06-17 22:32:49 +00:00
tomas@poseidon.bredbandsbolaget.se
c87a67b972 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
 2004-06-17 22:19:26 +00:00
tomas@poseidon.bredbandsbolaget.se
9c9ac18550 removed need for specifying TCP connections in MySQL Cluster configuration 2004-06-17 22:18:05 +00:00
tomas@poseidon.bredbandsbolaget.se
51602e0fb9 hpux compile fixes 2004-06-17 21:06:21 +00:00
tomas@poseidon.bredbandsbolaget.se
48a47a0ea6 Tru64 fixes 2004-06-17 17:38:05 +00:00