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

26165 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
0663157276 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 14:55:17 +05:00
unknown
44619bb95d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 13:44:20 +05:00
unknown
acc769f56a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-09-12 10:42:09 +02:00
unknown
838d8ed164 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 10:26:09 +02:00
unknown
c39b411058 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 13:08:08 +05:00
unknown
9832367a21 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hundin.mysql.fi:/home/jan/mysql-5.0
 2005-09-12 10:57:42 +03:00
unknown
f7042e522c 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
unknown
820e145679 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
unknown
018830874d merging 2005-09-12 12:09:44 +05:00
unknown
d3e07b9213 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
unknown
25fb012dcf Fix for BUG#13067 "JOIN ... USING is case sensitive". 
mysql-test/r/select.result:
  Test for BUG#13067
mysql-test/t/select.test:
  Test for BUG#13067
sql/sql_base.cc:
  Correctly compare field names with respect to case sensitivity.
 2005-09-12 08:28:53 +03:00
unknown
49be919a89 Merged from 4.1 2005-09-11 22:10:04 +03:00
unknown
8de4865a1c 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


mysql-test/t/analyse.test:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
mysql-test/r/analyse.result:
  Merge from 4.1
 2005-09-11 11:07:56 +03:00
unknown
e6f860aad0 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
unknown
a34a9d73c3 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-09-11 08:43:02 +02:00
unknown
6b52ad9aef 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
unknown
a94a724d31 Merge mysql.com:/users/lthalmann/bk/mysql-4.1-one_shot 
into  mysql.com:/users/lthalmann/bk/mysql-5.0


mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/sql_parse.cc:
  Manual marge
 2005-09-11 01:23:08 +02:00
unknown
e6560c0da0 Removed redundant reset_one_shot_variables calls 
sql/sql_parse.cc:
  Optimization, this reset is executed below anyway
 2005-09-11 00:57:31 +02:00
unknown
e85f42c5e6 options.cc: 
Fix typo.


server-tools/instance-manager/options.cc:
  Fix typo.
 2005-09-10 16:01:26 -05:00
unknown
fec16a6407 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-09-10 21:04:53 +02:00
unknown
62646826b8 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
unknown
7845a81a5f comp_err.c: 
Fix some comments.


extra/comp_err.c:
  Fix some comments.
 2005-09-10 12:31:57 -05:00
unknown
53043f535a 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
unknown
0fd4d20c53 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
unknown
f4ca9acdf1 Fix a valgrind warning. 2005-09-10 15:32:07 +04:00
unknown
5cc643087b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-09-10 08:23:41 +02:00
unknown
b5622d49eb BUG #12597 after merge, needed to produce results 
mysql-test/r/mysqldump.result:
  BUG #12597 - new results file because of merge of test and results file
 2005-09-10 01:50:39 +02:00
unknown
513269e7f2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-09-10 01:50:38 +02:00
unknown
cb03cbae7d Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  resolving conflicts in order to push for bug #12597
mysql-test/t/mysqldump.test:
  resolving conflicts for pushing to bug #12597
 2005-09-10 01:50:38 +02:00
unknown
fbfb8ed613 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
unknown
86ded90d2f 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
unknown
8c129f5012 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
unknown
fa13c29b2e 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.


mysql-test/t/insert_select.test:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
mysql-test/r/insert_select.result:
  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
unknown
11fef7846c 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


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
 2005-09-09 17:17:44 -04:00
unknown
1e6f12c04d 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
unknown
4344f602ce Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  eel.(none):/home/jonas/src/mysql-5.0-push
 2005-09-09 21:03:54 +02:00
unknown
af2d38f05c 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
unknown
c1a3b5be0a 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
unknown
1e77e26359 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
unknown
19fa54f04e Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type 
Added test case.
 2005-09-09 20:02:13 +03:00
unknown
6c7f692d2c 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
unknown
c34922c704 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
unknown
1495927047 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
unknown
d3837c7969 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-12101


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
 2005-09-09 20:17:08 +04:00
unknown
9ff63ae16f 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
unknown
9f0a79cb44 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
unknown
c7386a19ba Merge mysql.com:/home/alexi/dev/mysql-4.1-12101 
into  mysql.com:/home/alexi/dev/mysql-5.0-12101


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
 2005-09-09 19:08:12 +04:00
unknown
26f8e9c933 BUG #12101: Additional fix. 
sql/item_cmpfunc.cc:
  Modified Item_func_between::print(), Item_func_in::print().
  Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.
 2005-09-09 19:06:15 +04:00
unknown
057855a34a 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
unknown
27eeeab844 after merge fix 2005-09-09 17:51:13 +05:00