mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25368 commits 2780 branches 343 tags 1.6 GiB
Commit graph

12098 commits

Author SHA1 Message Date
aivanov@mysql.com
8a80193e0a Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-17 18:41:19 +04:00
timour@mysql.com
a55786ca70 WL#2486 - natural and using join according to SQL:2003 
- fixed a problem with RIGHT JOIN ON and enabled corresponding tests in select.test
- fixed a memory leak
 2005-08-17 17:19:31 +03:00
timour@mysql.com
0671228b05 Fixed code formatting. 2005-08-17 14:20:01 +03:00
timour@mysql.com
066e3c4209 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486
 2005-08-17 13:47:16 +03:00
timour@mysql.com
c8e55a35b3 WL#2486 - Process NATURAL and USING joins according to SQL:2003 
- Applied Monty's patch after his review of sql_base.cc
 2005-08-17 13:46:36 +03:00
aivanov@mysql.com
0a1fa93190 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 23:27:00 +04:00
andrey@lmy004.
41c93e368b Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12595
 2005-08-16 20:59:18 +02:00
andrey@lmy004.
7269045b82 after review fix for bug #12595 2005-08-16 20:54:53 +02:00
andrey@lmy004.
a7a762e27d fix for bug #12595 (Escape character has to be exactly one) 2005-08-16 15:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
c7bdc5bb12 Fixed indentations in error and warning messages. 2005-08-16 15:32:41 +03:00
aivanov@mysql.com
246c0e687c Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 15:35:39 +04:00
andrey@lmy004.wdf.sap.corp
c896ca1a10 fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar" 
(after review commit)
 2005-08-16 11:18:35 +02:00
jimw@mysql.com
68d5420d7c Clean up merge from 4.1 2005-08-15 14:19:56 -07:00
aivanov@mysql.com
405f03f389 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 00:03:50 +04:00
jimw@mysql.com
2d34276417 Merge mysql.com:/home/jimw/my/mysql-5.0-12318 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:39:36 -07:00
jimw@mysql.com
55eebfb776 Merge mysql.com:/home/jimw/my/mysql-5.0-10627 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:38:56 -07:00
jimw@mysql.com
a3eaf4eec2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:37:45 -07:00
monty@mysql.com
8589f14d45 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-15 20:12:28 +03:00
monty@mysql.com
c10f05552f Don't clear warnings for functions or triggers 
Fixed failing test
 2005-08-15 20:08:58 +03:00
jimw@mysql.com
df25928983 Merge mysql.com:/home/jimw/my/mysql-4.1-11796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 09:59:11 -07:00
jimw@mysql.com
e21a025c65 Merge mysql.com:/home/jimw/my/mysql-4.1-12327 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 09:58:05 -07:00
acurtis@xiphis.org
c414bb1520 Bug#12518 
"COLUMN_DEFAULT has wrong value if NOT NULL is set"
  Show NULL instead of empty string when no default value is set
 2005-08-15 17:14:55 +01:00
lars@mysql.com
b6a65715d6 BUG#12542: Prevous patch was incorrect. This removed the patch. 2005-08-15 17:53:38 +02:00
monty@mysql.com
1a6f16edd9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-15 18:35:48 +03:00
monty@mysql.com
df32f7d621 Save and clear run context before executing a stored function or trigger and restore it afterwards. 
This allows us to use statement replication with functions and triggers
The following things are fixed with this patch:
- NOW() and automatic timestamps takes the value from the main event for functions and triggers (which allows these to replicate with statement level logging)
- No side effects for triggers or functions with auto-increment values(), last_insert_id(), rand() or found_rows()
- Triggers can't return result sets

Fixes bugs:
#12480: NOW() is not constant in a trigger
#12481: Using NOW() in a stored function breaks statement based replication
#12482: Triggers has side effects with auto_increment values
#11587: trigger causes lost connection error
 2005-08-15 18:15:12 +03:00
serg@sergbook.mysql.com
fb19be7d6d Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-08-15 12:07:36 +02:00
evgen@moonbone.local
6bb2d4d7a9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11864
 2005-08-15 14:01:42 +04:00
evgen@moonbone.local
85afb22ef1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-10802
 2005-08-15 13:34:47 +04:00
evgen@moonbone.local
5dc75a559d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11864
 2005-08-15 13:21:55 +04:00
evgen@moonbone.local
7fcb9cd599 Fix bug #10802 Index is not used if table using BDB engine on HP-UX 
HP-UX compiler was generating code which makes wrong conversion from double to
ulonglong which results in not using index in some cases.

Changed type cast operators odrer with which generated code makes proper 
conversion.
 2005-08-15 13:02:29 +04:00
serg@sergbook.mysql.com
d689d415b3 forgotten 'return' 2005-08-14 23:20:06 +02:00
sanja@hasky.mysql.fi
562786bc36 table.cc: 
remove unneeded multitable_view assignment
sql_view.cc:
  fix potential memorry overrun in ref_array
  asssign multitable_view in time of view creation (BUG#12569)
 2005-08-13 17:06:30 +03:00
sanja@hasky.mysql.fi
1006063ef1 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hasky.mysql.fi:/home/sanja/work-merge-5.0
 2005-08-13 11:16:26 +03:00
sanja@hasky.mysql.fi
2e2b897ff3 item_subselect.cc: 
postmerge fix
subselect.result:
  new 5.0 result (postmerge)
 2005-08-13 11:15:17 +03:00
sanja@hasky.mysql.fi
16d279bb12 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  hasky.mysql.fi:/home/sanja/work-merge-5.0
 2005-08-13 08:19:34 +03:00
bell@50.0.168.192.in-addr.arpa
8d7a364074 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
 2005-08-13 07:49:22 +03:00
bell@50.0.168.192.in-addr.arpa
c96bedb745 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
 2005-08-13 07:46:06 +03:00
bell@50.0.168.192.in-addr.arpa
1e248ceaf1 fixed convertion and handling IN subqueries with rows (BUG#11867) 2005-08-13 07:45:14 +03:00
tsmith@.mysql.com
9097bd2f08 sql_parse.cc: 
Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)
 2005-08-13 05:08:29 +02:00
serg@sergbook.mysql.com
d42f973b80 merged 2005-08-12 22:58:13 +02:00
serg@sergbook.mysql.com
f5ff607c14 BUG#12162 - one can start two transactions with the same XID. 
Now we keep all active XID's in a hash
 2005-08-12 21:15:01 +02:00
evgen@moonbone.local
0f9b982970 Fix bug #12298 Typo in timestampdiff() function name results in erroneous 
view being created.

Item_func_timestamp_diff::func_name() were returning function name as
"timestamp_diff" thus when view was executed function parameters wasn't 
properly recognized and error was raised.
 2005-08-12 22:42:50 +04:00
timour@mysql.com
354ce1d024 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-2486-merge
 2005-08-12 19:27:54 +03:00
timour@mysql.com
a247282aa6 Implementation of WL#2486 - 
"Process NATURAL and USING joins according to SQL:2003".

* Some of the main problems fixed by the patch:
  - in "select *" queries the * expanded correctly according to
    ANSI for arbitrary natural/using joins
  - natural/using joins are correctly transformed into JOIN ... ON
    for any number/nesting of the joins.
  - column references are correctly resolved against natural joins
    of any nesting and combined with arbitrary other joins.

* This patch also contains a fix for name resolution of items
  inside the ON condition of JOIN ... ON - in this case items must
  be resolved only against the JOIN operands. To support such
  'local' name resolution, the patch introduces a stack of
  name resolution contexts used at parse time.

NOTICE:
- This patch is not complete in the sense that
  - there are 2 test cases that still do not pass -
    one in join.test, one in select.test. Both are marked
    with a comment "TODO: WL#2486".
  - it does not include a new test specific for the task
 2005-08-12 17:57:19 +03:00
osku@127.(none)
11fb9678a9 Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-12 16:21:13 +03:00
bar@mysql.com
4a071b4833 item_strfunc.cc: 
After merge change.
  4.1 method was replaced in 5.0.
 2005-08-12 18:13:42 +05:00
bar@mysql.com
1b50f35ab2 Merge mysql.com:/usr/home/bar/mysql-4.1.b12351 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-08-12 17:10:00 +05:00
monty@mysql.com
4963388cc1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-12 13:57:20 +03:00
monty@mysql.com
4c0d23e156 Fixes during review of new pushed code 
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
 2005-08-12 13:54:42 +03:00
bar@mysql.com
fd7ad7f16f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12351
 2005-08-12 15:44:03 +05:00