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

41253 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
b23cb23349 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-29 22:50:10 +01:00
msvensson@neptunus.(none)
9799bbd76f Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-29 22:49:31 +01:00
msvensson@neptunus.(none)
5f4acf145b After 5.1.6 just turn on logging, it will be sent to tables by default 2006-11-29 22:49:02 +01:00
monty@narttu.mysql.fi
717284b85c Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-29 23:07:15 +02:00
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
msvensson@neptunus.(none)
7aec43481d Change mode of the checked in 4.1 version files so they are writable 2006-11-29 21:38:38 +01: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
msvensson@shellback.(none)
f7bbcb71cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
 2006-11-29 21:31:05 +01: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
msvensson@shellback.(none)
521464755c Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
 2006-11-29 19:32:36 +01:00
cmiller@zippy.cornsilk.net
42291995c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-29 12:50:07 -05:00
cmiller@zippy.cornsilk.net
d577e3d4a8 Fix merges. 2006-11-29 12:49:21 -05: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
msvensson@shellback.(none)
e9d526f50a Merge fixes for new test cases 2006-11-29 18:35:33 +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
iggy@rolltop.ignatz42.dyndns.org
98c6f8bf49 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
 2006-11-29 12:15:15 -05: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
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 15:44:09 +01:00
mskold/marty@mysql.com/linux.site
7d86df6af1 bug#24303 Wrong result for UPDATE IGNORE for NDB table: Refinement, only read all fields for UPDATE IGNORE with pk (check if UPDATE command and pk in write_set) 2006-11-29 15:33:11 +01: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
mskold/marty@mysql.com/linux.site
cf58d3a136 bug#24303 Wrong result for UPDATE IGNORE for NDB table: Read all fields for UPDATE IGNORE with pk 2006-11-29 13:23:19 +01:00
jonas@perch.ndb.mysql.com
e699ca7304 ndb - bug#24105 
Handle not started nodes correctly (for X restart)
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP
 2006-11-29 13:10:14 +01:00
thek@kpdesk.mysql.com
a17c01ff5c Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2006-11-29 13:07:50 +01:00
thek@kpdesk.mysql.com
7fdc1aa71a Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2006-11-29 13:04:48 +01:00