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
33584 commits 2780 branches 343 tags 1.6 GiB
Commit graph

33584 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold/marty@mysql.com/linux.site
a172df24a9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 16:04:12 +01:00
mskold/marty@mysql.com/linux.site
638c294b7f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 15:57:43 +01:00
mskold/marty@mysql.com/linux.site
af324d9cf0 #18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows 2006-11-30 15:02:33 +01: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
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
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
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
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
df@kahlann.erinye.com
1c46f7d841 minor fix 2006-11-29 10:21:59 +01:00
kostja@bodhi.local
644639fcbd Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-29 11:19:55 +03:00
kostja@bodhi.local
5fea0724bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-29 02:44:12 +03:00
kostja@bodhi.local
bf3fbb44ae Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-29 02:39:17 +03:00
joerg@trift2.
3406fcea39 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-28 18:45:10 +01:00
joerg@trift2.
3680ba8706 Merge trift2.:/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-28 18:39:17 +01:00
joerg@trift2.
648e86e108 netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain wrong - drop it. 2006-11-28 18:36:53 +01:00
kent@mysql.com/kent-amd64.(none)
de6eb0afb2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-11-28 18:11:21 +01:00
kent@mysql.com/kent-amd64.(none)
d3f73f27fa Makefile.am: 
Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.
 2006-11-28 18:08:30 +01:00
kent@mysql.com/kent-amd64.(none)
d9e0763cba Merge mysql.com:/home/kent/bk/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-11-28 18:07:50 +01:00
kent@mysql.com/kent-amd64.(none)
08e0e06eab Makefile.am: 
If using \$(srcdir)/mysql.info in action, use same in rule.
 2006-11-28 18:04:10 +01:00
joerg@trift2.
dd97e53171 Merge trift2.:/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-28 13:03:32 +01:00
kent@mysql.com/kent-amd64.(none)
ae605ec9d8 Merge mysql.com:/home/kent/bk/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-11-28 00:42:41 +01:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.0-merge
 2006-11-27 21:45:16 +01:00
kent@mysql.com/kent-amd64.(none)
12c3e410d4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/mysql-4.1-merge
 2006-11-27 21:38:53 +01:00
kent@mysql.com/kent-amd64.(none)
5fcb7a4ef1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.0
 2006-11-27 21:21:00 +01:00
kent@mysql.com/kent-amd64.(none)
1b61612f86 ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4: 
Reenabled build outside source tree
 2006-11-27 21:15:25 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c48c8e9015 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into  mysql.com:/Users/kent/mysql/bk/build/mysql-5.0-build
 2006-11-27 19:09:21 +01:00
kent@mysql.com/kent-amd64.(none)
27ead71f12 Merge mysql.com:/home/kent/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/mysql-5.0
 2006-11-27 19:06:24 +01:00
kent@mysql.com/kent-amd64.(none)
b7e107bf2d Makefile.am: 
BSD compatibility
 2006-11-27 19:04:57 +01:00
kent@mysql.com/kent-amd64.(none)
cbe9d22927 Merge mysql.com:/home/kent/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/mysql-5.0
 2006-11-27 18:47:07 +01:00
kent@mysql.com/kent-amd64.(none)
6c85ba399d gen_rec.awk: 
Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree
 2006-11-27 18:29:50 +01:00
gkodinov@dl145s.mysql.com
e74c9add47 Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-27 16:25:52 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
9d328d7d62 mysql-test-run.pl: 
Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
  Don't try output "skipped" comment if there is none (bug#24471)
 2006-11-24 18:26:53 +01:00
df@kahlann.erinye.com
728357200c 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-24 15:36:51 +01:00
df@kahlann.erinye.com
34cedd8d77 fixes for mtr_unique.pl 2006-11-24 15:36:04 +01:00
anozdrin/alik@booka.
ea47e05f3c Fix for BUG##24415: Instance manager test im_daemon_life_cycle 
fails randomly.

The problem was that the test case used command line tool (mysql)
without specifying connect_timeout argument. In some cases,
this lead to hanging of the test case.

The fix is to specify --connect_timeout=1 when starting mysql.

Also, the patch contains polishing and various cleanups to simplify
analyzing of the problems further.

The patch affects only test suite, no server codebase has been
touched.
 2006-11-23 22:55:36 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
35cfb3876d Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2006-11-23 20:08:12 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f1ec3372be Many files: 
Adjuster project files to reflect move of "mySTL" directory
 2006-11-23 20:04:18 +01:00
monty@mysql.com/nosik.monty.fi
501333f694 Added option --mtr-build-thread to mysql-test-run.pl 
Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable
 2006-11-23 18:39:10 +02:00
monty@mysql.com/nosik.monty.fi
fb9bb62b1e Added some missing DBUG_RETURN 
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
 2006-11-23 16:41:21 +02:00
msvensson@neptunus.(none)
bc59087a9a Add define for my_getpagesize to 8192(reworked in 5.0) 2006-11-23 12:06:04 +01:00
msvensson@neptunus.(none)
2aa0d085e3 Build fixes for NetWare 2006-11-23 11:38:44 +01:00
msvensson@neptunus.(none)
8e6cf24d3b Fix my_system_gmt_sec function declaration to be same as definition 2006-11-23 09:56:50 +01:00
kroki/tomash@moonlight.intranet
3b9a8532f5 After merge fixes: remove const and add query buffer. 2006-11-22 16:49:32 +03:00
kroki/tomash@moonlight.intranet
21daae583d Cleanup: remove const. 2006-11-22 16:47:12 +03:00