mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33617 commits 2784 branches 343 tags 1.6 GiB
Commit graph

33617 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@kahlann.erinye.com
bb1297cdc3 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-07 15:13:12 +01:00
df@kahlann.erinye.com
77965c013c BUG#24780 use --sysconfdir in scripts 2006-12-07 15:02:32 +01:00
df@kahlann.erinye.com
41a2a6080c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-05 10:05:15 +01:00
df@kahlann.erinye.com
6541302bb2 re-enable multiple test runs in sequence for 4.1 on non-windows 2006-12-05 10:03:24 +01:00
kent@mysql.com/kent-amd64.(none)
d72b71ef9f mysql_install_db.sh: 
If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
 2006-12-02 23:16:47 +01:00
kent@mysql.com/kent-amd64.(none)
cbf529790a Makefile.am: 
Added "mysql_client_test.def"
mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
 2006-12-02 06:06:31 +01:00
kent@mysql.com/kent-amd64.(none)
ee8cdf9ded Merge mysql.com:/home/kent/bk/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-12-02 00:27:34 +01:00
kent@mysql.com/kent-amd64.(none)
fb5abf8f4f mysql_upgrade.def Makefile.am: 
Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
  Allocate 128K stack for all executables (bug#23504)
 2006-12-01 23:09:14 +01:00
df@kahlann.erinye.com
da7820c37d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-01 13:02:54 +01:00
df@kahlann.erinye.com
e6a2d18421 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2006-12-01 10:36:42 +01:00
df@kahlann.erinye.com
feb70084d3 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-01 10:27:19 +01:00
df@kahlann.erinye.com
9a6f9c8c44 late after-merge fix 2006-11-30 22:45:55 +01:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a Fixed compiler warnings 
Don't assert if my_thread_end() is called twice (common case)
 2006-11-30 21:56:03 +02:00
gkodinov/kgeorge@macbook.gmz
8b8e820224 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt
 2006-11-30 18:49:50 +02:00
gkodinov/kgeorge@macbook.gmz
36e7fbc033 func_group.test, func_group.result, func_gconcat.result, func_gconcat.test: 
merge fix : removed undeterministic warnings
 2006-11-30 18:47:59 +02:00
monty@mysql.com/narttu.mysql.fi
3d40956039 Fixed portability issue in my_thr_init.c (was added in my last push) 
Fixed compiler warnings (detected by VC++):
- Removed not used variables
- Added casts
- Fixed wrong assignments to bool
- Fixed wrong calls with bool arguments
- Added missing argument to store(longlong), which caused wrong store method to be called.
 2006-11-30 18:25:05 +02:00
df@kahlann.erinye.com
d92eea8687 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-11-30 13:27:26 +01:00
df@kahlann.erinye.com
31d0b4e985 minor fix to mtr_process.pl 2006-11-30 13:16:12 +01:00
gkodinov@dl145s.mysql.com
5a35274b2b Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-30 12:23:30 +01:00
gkodinov@dl145s.mysql.com
03431eb78a Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-30 12:22:32 +01:00
gkodinov@dl145s.mysql.com
99444d7253 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-11-30 12:20:24 +01:00
gkodinov/kgeorge@macbook.gmz
7464a20bc8 func_gconcat.result, func_gconcat.test: 
disabled warnings because their order is undeterministic
 2006-11-30 12:58:05 +02:00
kostja@bodhi.local
4d418e6c43 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-30 02:05:40 +03:00
kostja@bodhi.local
726c43cc00 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-30 02:04:43 +03:00
kostja@bodhi.local
605404ec68 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-30 02:00:39 +03:00
kostja@bodhi.local
c6c172e40c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-30 01:58:57 +03:00
monty@mysql.com/narttu.mysql.fi
0bee93e038 Ignore some generated files 
Don't return from my_thread_global_end() until all threads have called my_thread_end()
Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
 2006-11-29 22:14:08 +02:00
kent@mysql.com/kent-amd64.(none)
cae575a390 Merge mysql.com:/home/kent/bk/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-11-29 20:24:41 +01:00
kent@mysql.com/kent-amd64.(none)
3643b3689f Makefile.am: 
Remove soft links before creating source TAR, to avoid file copies (bug#11865)
 2006-11-29 20:22:58 +01:00
kent@mysql.com/kent-amd64.(none)
c048bf11ab Makefile.am: 
Corrected change to create "win" directory
 2006-11-29 19:41:48 +01:00
kent@mysql.com/kent-amd64.(none)
43eba545f3 Makefile.am: 
"make distcheck" fix, "win" directory
 2006-11-29 19:35:40 +01:00
kroki/tomash@moonlight.intranet
3881fa9e66 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637
 2006-11-29 18:54:01 +03:00
gkodinov@dl145s.mysql.com
1405ed13fe Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
 2006-11-29 16:32:13 +01:00
monty@mysql.com/narttu.mysql.fi
8aec636ba8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-11-29 17:25:23 +02:00
evgen@moonbone.local
ecc63d81b8 view_grant.result: 
Small fix for a test case
 2006-11-29 18:12:08 +03:00
gkodinov@dl145s.mysql.com
8d5137c493 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
 2006-11-29 15:22:16 +01:00
gkodinov@dl145s.mysql.com
fd28e74aa6 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
 2006-11-29 15:21:28 +01:00
gkodinov@dl145s.mysql.com
5c0be323ac Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
 2006-11-29 15:20:30 +01:00
gkodinov@dl145s.mysql.com
ac9175a7ef Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt
 2006-11-29 15:19:13 +01:00
kent@mysql.com/kent-amd64.(none)
b67ff612d3 Merge mysql.com:/home/kent/bk/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-11-29 14:25:30 +01:00
kroki/tomash@moonlight.intranet
50e3b32170 BUG#20637: "load data concurrent infile" locks the table 
Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
inside a stored routine and MySQL is compiled with Query Cache support
(this is not in the manual).

The problem was that the condition test of "we are inside stored routine"
was reversed, thus CONCURRENT _worked only_ from stored routine.  The
solution is to use proper condition test.

No test case is provided because the test case would require a large
amount of input, and it's hard to tell is SELECT is really blocked or
just slow (subject to race).
 2006-11-29 15:51:53 +03:00
evgen@moonbone.local
595d8c5bcb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/20327-bug-5.0-opt-mysql
 2006-11-29 15:03:53 +03:00
evgen@moonbone.local
e851a9eaea Bug#20327: Marking of a wrong field leads to a wrong result on select with view, 
prepared statement and subquery.

When a field of a view from an outer select is resolved the find_field_in_view
function creates an Item_direct_view_ref object that references the 
corresponding view underlying field. After that the view_ref is marked
as a dependent one. While resolving view underlying field it also get
marked as a dependent one due to current_select still points to the subselect.
Marking the view underlying field is wrong and lead to attaching conditions
to a wrong table and thus to the wrong result of the whole statement.

Now mark_select_range_as_dependent() function isn't called for fields from a 
view underlying table.
 2006-11-29 14:52:11 +03:00
evgen@moonbone.local
1314ab222f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/17254-bug-5.0-opt-mysql
 2006-11-29 14:44:24 +03:00
gkodinov@dl145s.mysql.com
4ff4cabbef Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
 2006-11-29 11:26:57 +01:00
gkodinov@dl145s.mysql.com
43c3dfeb27 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
 2006-11-29 11:25:22 +01:00
gkodinov@dl145s.mysql.com
4b8039bf6a Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt
 2006-11-29 11:16:50 +01:00
df@kahlann.erinye.com
343e779571 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2006-11-29 10:35:15 +01:00
df@kahlann.erinye.com
756f104591 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-11-29 10:33:23 +01:00
df@kahlann.erinye.com
c134b8c332 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-11-29 10:22:43 +01:00