mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26145 commits 2781 branches 343 tags 1.6 GiB
Commit graph

26145 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold@mysql.com
216f3d3dff Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-09-12 09:37:17 +02:00
mskold@mysql.com
a934f75e81 Repair of condition pushdown after Item_func_between/in objects now directly represent NOT BETWEEN/IN expressions (ChangeSet@1.2402.1.1) 2005-09-12 09:36:07 +02:00
timour@mysql.com
7205d3716c Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-dbg
 2005-09-12 09:34:58 +03:00
timour@mysql.com
6a528590d9 Fix for BUG#13067 "JOIN ... USING is case sensitive". 2005-09-12 08:28:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
afb613bd8e Merged from 4.1 2005-09-11 22:10:04 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
91b6fe2679 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-09-11 11:07:56 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
27373d1d11 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-09-11 10:31:55 +03:00
paul@frost.snake.net
1e1c04ff91 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
 2005-09-10 19:37:57 -05:00
lars@mysql.com
f8594113cf Merge mysql.com:/users/lthalmann/bk/mysql-4.1-one_shot 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-09-11 01:23:08 +02:00
lars@mysql.com
eff11c53a6 Removed redundant reset_one_shot_variables calls 2005-09-11 00:57:31 +02:00
paul@frost.snake.net
c26dd3057c options.cc: 
Fix typo.
 2005-09-10 16:01:26 -05:00
paul@snake-hub.snake.net
97a058bcfd Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2005-09-10 13:20:33 -05:00
paul@snake-hub.snake.net
7331526a62 comp_err.c: 
Fix some comments.
 2005-09-10 12:31:57 -05:00
jani@a193-229-222-105.elisa-laajakaista.fi
2917515afc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-09-10 18:41:37 +03:00
sergefp@mysql.com
a645d10cf2 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-merge
 2005-09-10 15:33:16 +04:00
sergefp@mysql.com
66d6373d14 Fix a valgrind warning. 2005-09-10 15:32:07 +04:00
patg@radha.local
a237d20152 BUG #12597 after merge, needed to produce results 2005-09-10 01:50:39 +02:00
patg@radha.local
f41aa04b59 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
 2005-09-10 01:50:38 +02:00
patg@radha.local
7eb20fede8 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
 2005-09-10 01:50:37 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
d28b710cd9 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-09-09 19:50:36 -04:00
evgen@moonbone.local
94f5e80c86 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/12695-bug-4.1-mysql
 2005-09-10 02:31:42 +04:00
evgen@moonbone.local
99c0bf333c insert_select.result, insert_select.test: 
Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
 2005-09-10 02:30:26 +04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
9802cc6e58 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
 2005-09-09 17:17:44 -04:00
patg@radha.local
ad0df8de00 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
 2005-09-09 21:58:54 +02:00
patg@radha.local
15bbf4d215 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597
 2005-09-09 21:03:11 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
960802928c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-09-09 21:30:03 +03:00
aivanov@mysql.com
19d836e235 Merge mysql.com:/home/alexi/mysql-4.1 
into  mysql.com:/home/alexi/dev/mysql-4.1-12101
 2005-09-09 21:02:13 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
ac95c9096b Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type 
Added test case.
 2005-09-09 20:02:13 +03:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
12ffe0da12 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
 2005-09-09 13:02:12 -04:00
sergefp@mysql.com
6415364ea7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-merge
 2005-09-09 20:51:17 +04:00
patg@radha.local
9faaeb2508 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
 2005-09-09 18:19:47 +02:00
aivanov@mysql.com
b6ee8dd913 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-12101
 2005-09-09 20:17:08 +04:00
sergefp@mysql.com
c46e31fc73 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-merge
 2005-09-09 20:10:46 +04:00
sergefp@mysql.com
97d4cb60f3 Fix for valgrind warning/crashes: When executing SP statement, If we set 
thd->user_var_events_alloc (and so get binlog events to be allocated on its pool), 
clean the binlog events after the execution of this SP statement is finished.
 2005-09-09 20:09:37 +04:00
aivanov@mysql.com
29e8b30fc2 Merge mysql.com:/home/alexi/dev/mysql-4.1-12101 
into  mysql.com:/home/alexi/dev/mysql-5.0-12101
 2005-09-09 19:08:12 +04:00
aivanov@mysql.com
5eae17bc3c BUG #12101: Additional fix. 2005-09-09 19:06:15 +04:00
gluh@mysql.com
39efb8c865 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-09-09 17:52:08 +05:00
gluh@eagle.intranet.mysql.r18.ru
1a9cf5b63b after merge fix 2005-09-09 17:51:13 +05:00
konstantin@mysql.com
dd02830957 Comment why lex->result is ignored if EXPLAIN 2005-09-09 16:23:12 +04:00
gluh@mysql.com
729829f3b2 manual merge 2005-09-09 16:52:44 +05:00
serg@serg.mylan
78590ad53b aftermerge 2005-09-09 12:47:57 +02:00
serg@serg.mylan
3d7844ca89 merged 2005-09-09 12:43:25 +02:00
serg@serg.mylan
f16bb5da7e aftermerge 2005-09-09 12:15:25 +02:00
andrey@lmy004.
06fe0537c3 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 11:27:21 +02:00
sergefp@mysql.com
98fee7f289 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-merge
 2005-09-09 12:57:41 +04:00
sergefp@mysql.com
cd813a0911 Post-merge fixes 2005-09-09 12:57:00 +04:00
serg@serg.mylan
b69f49c0d5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-09-09 10:49:09 +02:00
andrey@lmy004.
13d3cf8ff6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug12651
 2005-09-09 10:27:58 +02:00
gluh@eagle.intranet.mysql.r18.ru
99bc9607e1 Bug#12817 SHOW STATUS now blob fields 
This fix is cancellation of ChangeSet
   1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0
   Bug 7142  Show Fields from fails using Borland's dbExpress interface
   The reason is we can't fix bug#7142 without
   breaking of existing applications/APIs that worked fine with earlier 4.1
   bug 7142 is fixed in 5.0
 2005-09-09 13:22:16 +05:00
sergefp@mysql.com
57c3ed9e1c Post-merge fixes 2005-09-09 11:50:38 +04:00