1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,407 Commits 3,050 Branches 357 Tags
Commit Graph

26407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unknown
0a3202bedf removed a few aborts from mgmapi 
corrected typo in ndb Parser
 2005-09-12 14:03:23 +02:00
unknown
39c2107eb2 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
unknown
2eb6b134a6 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
unknown
8f37abbf5e 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
unknown
2bcdbdabee 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
unknown
3d946666a2 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
unknown
2e972bbe3a manual merge 2005-09-12 15:02:57 +05:00
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
c2bdd1c0e0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-09-12 11:43:22 +02:00
unknown
e98e15db9b ps_6bdb, ps_7ndb tests failure fix 2005-09-12 14:21:38 +05:00
unknown
4aea99640c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12891


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
 2005-09-12 14:09:44 +05:00
unknown
eac9a33778 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
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
01587e479a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-09-12 10:40:40 +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
d076066752 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-09-12 10:18:39 +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
b3dc4ea3e3 Fix bug #12993 View column rename broken in subselect 
When view column aliased in subselect alias is set on ref which represents
field. When tmp table is created for subselect, it takes name of original field
not ref. Because of this alias on view column in subselect is lost. Which
results in reported error.

Now when alias is set on ref, it's set on ref real item too.


mysql-test/r/view.result:
  Test case for bug #12993  View column rename broken in subselect
mysql-test/t/view.test:
  Test case for bug #12993  View column rename broken in subselect
sql/sql_base.cc:
  Fix bug #12993 View column rename broken in subselect
  Now when alias is set on ref, it's set on ref real item too.
 2005-09-12 02:46:35 +04:00
unknown
49be919a89 Merged from 4.1 2005-09-11 22:10:04 +03:00
unknown
e21f484390 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
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
fe75dc51b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-09-11 08:41:33 +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
0dec682f39 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.


mysql-test/r/select.result:
  Added test for BUG#12943.
mysql-test/t/select.test:
  Added test for BUG#12943.
sql/sql_parse.cc:
  Fixed typo.
sql/sql_yacc.yy:
  Provide explicit priorities of the JOIN operator and the 'table_ref' rule,
  to enforce left-associativity of [INNER | CROSS] JOIN.
 2005-09-10 15:01:54 +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
dc06ac31d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  eel.(none):/home/jonas/src/mysql-4.1-push
 2005-09-10 08:22:24 +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