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

25471 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
jimw@mysql.com
f693d22bb1 Make sure to clean up temporary files in myisampack even when the 
-T option is used. (Bug #12235)
 2005-08-12 11:44:25 -07: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
8f115aafd7 WL#2486 
Disabled one test case because it is still a problem due to the fix for WL#2486.
Pushed to enable code review.
 2005-08-12 20:10:24 +03: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
lenz@mysql.com
2316f8cb33 Merge lgrimmer@bk-internal:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-08-12 15:55:26 +02: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
lenz@mysql.com
acaad2c70b Merge mysql.com:/space/my/mysql-4.0 
into mysql.com:/space/my/mysql-4.0-merge
 2005-08-12 14:44:16 +02:00
lenz@mysql.com
61a9bace12 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-merge
 2005-08-12 14:44:03 +02:00
lenz@mysql.com
dc0d959b07 Merge mysql.com:/space/my/mysql-5.0 
into mysql.com:/space/my/mysql-5.0-build
 2005-08-12 14:41:23 +02: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
reggie@linux.site
869869fa0c Bug #6581 Failure to start mysql server on Windows with AWE option enabled 2005-08-12 04:44:04 -06: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
lenz@mysql.com
77bb2add1b Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-5.0-build
 2005-08-12 11:49:42 +02:00
igor@rurik.mysql.com
3f1f7102ca sql_view.cc: 
A safety correction.
 2005-08-12 02:17:27 -07:00
osku@127.(none)
b1c81e43ac Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  127.(none):/home/osku/mysql-5.0
 2005-08-12 11:40:02 +03:00
osku@127.(none)
04056ffd3d InnoDB: Print more than 300 characters of queries in various error conditions, 
most notably deadlocked ones in SHOW INNODB STATUS. Fixes bug #7819.
 2005-08-12 11:39:19 +03:00
igor@rurik.mysql.com
42810cd07a Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-08-12 01:33:45 -07:00
igor@rurik.mysql.com
da441e949c sql_base.cc: 
Fixed bug #12470.
  A misplaced initialization of the cond_count counter
  resulted in a wrong calculation of it. This caused a memory
  corruption since this counter was used as a parameter of
  some memory allocation.
view.test:
  Added a test case for bug #12470.
 2005-08-12 01:27:04 -07:00
lenz@mysql.com
8a72ee556d Merge mysql.com:/space/my/mysql-4.0-merge 
into mysql.com:/space/my/mysql-4.1-merge
 2005-08-12 08:13:02 +02:00
jimw@mysql.com
898aae5e0f Add SLEEP(seconds) function, which always returns 0 after the given 
number of seconds (which can include microseconds). (Bug #6760)
 2005-08-11 18:58:22 -07:00
patg@radha.local
15ba37d438 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean
 2005-08-12 03:34:57 +02:00
jimw@mysql.com
7d1c4bc3c9 Fix which include file is used to decide whether to skip rpl_openssl, the 
earlier change wasn't correct. (But the other changes to the test were.)
 2005-08-11 17:14:11 -07:00
jimw@mysql.com
3a815f45bd Avoid spurious error when restoring INFORMATION_SCHEMA as the current 
database after failing to execute a stored procedure in an inaccessible
database. (Bug #12318)
 2005-08-11 17:04:16 -07:00
igor@rurik.mysql.com
0aff8a13dc sql_base.cc: 
Fixed bug #12382.
  INSERT statement effectively changed thd->set_query_id to 0,
  while SELECT statement changed it to 0. As a result
  the insert_fields function that expanded '*' was called
  with different values of thd->set_query_id for the query
  SELECT * FROM view depending on whether it was run after
  an INSERT or after a SELECT statement. This was corrected
  by restoring the old value of thd->set_query_id when
  returning from the function setup_fields where possible
  reset could occur.
  If the value of thd->set_query_id == 0 then the fields
  substituted instead of '*' were not registered as used
  for bitmaps used_keys. This caused selection of an invalid
  execution plan for the query SELECT * from <view>.
view.result, view.test:
  Added a test case for bug #12382.
 2005-08-11 16:10:34 -07:00
jimw@mysql.com
03162293da Merge mysql.com:/home/jimw/my/mysql-5.0-12457 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-11 14:35:01 -07:00
jimw@mysql.com
3422ad3a1f Merge mysql.com:/home/jimw/my/mysql-5.0-12324 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-11 12:47:43 -07:00
jimw@mysql.com
d1db84639c Build YASSL libraries with libtool so correct PIC settings are used 
automatically. (Bug #12324)
 2005-08-11 12:26:17 -07:00
lenz@mysql.com
16b696a60e - another comment typo fixed 2005-08-11 21:18:45 +02:00
lenz@mysql.com
c1c336f84b - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to 
preflight/postflight instead, so they are run every time a PKG is installed, not only for
  a fresh installation
 2005-08-11 20:23:12 +02:00
vtkachenko@quadxeon.mysql.com
ba8df85719 Merge bk-internal:/home/bk/mysql-5.0 
into quadxeon.mysql.com:/users/vtkachenko/bk/mysql-5.0-tmp
 2005-08-11 20:19:28 +02:00
lenz@mysql.com
776bf91371 - Make sure the Mac OS X support files are built, but not installed by "make install" (the previous 
change was too drastic) (BUG#12506)
 2005-08-11 20:13:12 +02:00
acurtis@xiphis.org
ee71edd1fe Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  xiphis.org:/usr/home/antony/work2/merge-5.0
 2005-08-11 18:44:53 +01:00
acurtis@xiphis.org
597b7412c7 fix after merge 2005-08-11 18:42:22 +01:00
jani@ua141d10.elisa.omakaista.fi
1a7af25913 Fixed some warning and error messages so that they use 
sql_print_warning() and sql_print_error() instead of fprintf to stderr.
Above functions are tuned for different platforms so that the behavior
is consistent around platforms. Using fprintf() different behavior can
be expected at least on Windows and Unix.
 2005-08-11 19:19:20 +03:00
vtkachenko@quadxeon.mysql.com
fc22a36d78 set_var.cc, mysqld.cc, ha_innodb.h, ha_innodb.cc, srv0srv.c, srv0srv.h: 
Added innodb_commit_concurrency variable
 2005-08-11 18:03:01 +02:00
monty@mysql.com
e80252e53c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-11 16:43:22 +03:00
monty@mysql.com
7b80e62528 Cleanups during review of new code 2005-08-11 15:58:15 +03:00
kent@mysql.com
fd4880814c Makefile.am: 
config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
 2005-08-11 13:47:24 +02:00
acurtis@xiphis.org
b9476f7d50 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1 
into  xiphis.org:/usr/home/antony/work2/merge-5.0
 2005-08-11 12:18:53 +01:00
sanja@arthur.local
3b64651683 query_cache_notembedded.test, query_cache_notembedded.result: 
postmerge fix
 2005-08-11 13:07:08 +03:00
bell@51.0.168.192.in-addr.arpa
4f26fa5184 merge 2005-08-11 10:20:06 +03:00