mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-26 08:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40581 commits 2779 branches 343 tags 1.6 GiB
Commit graph

40581 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@narttu.mysql.fi
2e8d2e3ef9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-29 22:54:11 +02:00
monty@mysql.com/narttu.mysql.fi
23263db66e Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations 
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
 2006-11-29 22:51:09 +02:00
kostja@bodhi.local
966c569b94 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-29 23:36:26 +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@kent-amd64.(none)
4ed32e0448 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 20:25:20 +01: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@kent-amd64.(none)
e5ebcd1653 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 19:42:19 +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@kent-amd64.(none)
ffe9fcf123 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 19:37:59 +01:00
kent@mysql.com/kent-amd64.(none)
43eba545f3 Makefile.am: 
"make distcheck" fix, "win" directory
 2006-11-29 19:35:40 +01:00
joerg@trift2.
ae34e3b12b Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-29 18:47:40 +01:00
kent@mysql.com/kent-amd64.(none)
ea5c7f9756 Many files: 
Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries
 2006-11-29 18:36:51 +01:00
baker@bk-internal.mysql.com
94dc5d5379 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-29 18:31:13 +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
kroki/tomash@moonlight.intranet
e149e6af5d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637
 2006-11-29 18:51:28 +03:00
gkodinov@dl145s.mysql.com
96181cd2c5 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
 2006-11-29 16:34:25 +01: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
48764da66f Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
 2006-11-29 15:24:51 +01:00
gkodinov@dl145s.mysql.com
eaf8588c8b Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
 2006-11-29 15:23:27 +01: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
gkodinov@dl145s.mysql.com
40027fb712 func_in.result, group_min_max.result: 
merged 5.0 testcases
 2006-11-29 14:51:22 +01:00
kent@kent-amd64.(none)
3749d77c8c Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 14:35:59 +01:00
kent@kent-amd64.(none)
65183d54d2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 14:28:05 +01:00
kent@kent-amd64.(none)
cc71956401 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 14:26:47 +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
joerg@trift2.
a530720cab Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-29 14:03:34 +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
mskold/marty@linux.site
77a59a1f48 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-29 11:55:52 +01:00
mskold/marty@mysql.com/linux.site
ae0d7e87d9 bug#24303 Wrong result for UPDATE IGNORE for NDB table: Added test case 2006-11-29 11:53:43 +01:00
gkodinov@dl145s.mysql.com
b58b551810 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.1-opt
 2006-11-29 11:48:44 +01: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
joerg@trift2.
0e8e604949 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-29 10:36:53 +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
b6a83ccb7a Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-11-29 10:23:48 +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
df@kahlann.erinye.com
1c46f7d841 minor fix 2006-11-29 10:21:59 +01:00
gkodinov@dl145s.mysql.com
40684173ad Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-29 10:21:13 +01:00
kostja@bodhi.local
2525e16c73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-29 11:44:37 +03:00