mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26185 commits 2788 branches 343 tags 1.7 GiB
Commit graph

26185 commits

This branch
This branch
All branches
Author SHA1 Message Date
jmiller@mysql.com
9f573f0ac8 Adding comment for force manual merge 5.0 -> wl1012 2005-09-12 22:47:15 +02:00
timour@mysql.com
d0f585f11f BUG#12943 - post-merge fix 2005-09-12 19:18:17 +03:00
timour@mysql.com
54db60c080 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-12943
 2005-09-12 19:05:55 +03:00
bar@mysql.com
2315c4f224 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-09-12 19:38:53 +05:00
bar@mysql.com
833bccfe57 Many files: 
Adding esperanto collation
 2005-09-12 19:35:50 +05:00
tulin@dl145c.mysql.com
e382a0fb12 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-09-12 14:11:28 +02:00
tulin@dl145c.mysql.com
f80e113d0e removed a few aborts from mgmapi 
corrected typo in ndb Parser
 2005-09-12 14:03:23 +02:00
lars@mysql.com
fd85a82559 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
 2005-09-12 13:00:55 +02:00
ramil@mysql.com
fa2cb2ae82 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 15:38:21 +05:00
ramil@mysql.com
4b57db2447 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12917
 2005-09-12 15:28:09 +05:00
bar@mysql.com
0d97562bd3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12891
 2005-09-12 15:26:01 +05:00
gluh@mysql.com
2db09b4cfc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.0
 2005-09-12 15:04:22 +05:00
gluh@mysql.com
bada46cbf0 manual merge 2005-09-12 15:02:57 +05:00
ramil@mysql.com
b0ae5792c8 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
gluh@eagle.intranet.mysql.r18.ru
2a07350854 ps_6bdb, ps_7ndb tests failure fix 2005-09-12 14:21:38 +05:00
bar@mysql.com
2f13c5c12c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12891
 2005-09-12 14:09:44 +05:00
lars@mysql.com
683edc6599 Reverted old fix with sync_slave_with_master and added a replace commands 
to eliminate nondeterminism in slave start
 2005-09-12 10:50:42 +02:00
ramil@mysql.com
33d91d2e73 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
jonas@eel.(none)
39e2548da5 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
mskold@mysql.com
357132b0b8 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
ramil@mysql.com
b424f5450b 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
jan@hundin.mysql.fi
cbc0f19566 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
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
ramil@mysql.com
c4ea0e2bf8 merging 2005-09-12 12:09:44 +05: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
lars@mysql.com
e5503c277f Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
 2005-09-11 13:46:36 +02: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
jonas@eel.(none)
1fabde4309 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
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
jonas@eel.(none)
737fba66b7 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
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
timour@mysql.com
7d24bdac22 Fix for BUG#12943. 
The problem was that in the first production in rule 'join_table', that
processes simple cross joins, the parser was processing the second join operand
before the first one due to unspecified priorities of JOINs. As a result in the
case of cross joins the parser constructed a tree with incorrect nesting:
the expression "t1 join t2 join t3 on some_cond" was interpreted as
"t1 join (t2 join t3 on some_cond)" instead of
"(t1 join t2) join t3 on some_cond".
Because of this incorrect nesting the method make_join_on_context picked an
incorrect table as the first table of the name resolution context.

The solution assignes correct priorities to the related production.
 2005-09-10 15:01:54 +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
jonas@eel.(none)
1835c00e84 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
patg@radha.local
a237d20152 BUG #12597 after merge, needed to produce results 2005-09-10 01:50:39 +02:00
jonas@eel.(none)
a50c9f2d61 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
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