mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25056 commits 2776 branches 343 tags 1.6 GiB
Commit graph

25056 commits

This branch
This branch
All branches
Author SHA1 Message Date
heikki@hundin.mysql.fi
74fd4504bb Many files: 
Push the patch of Jan Lindstrom: better comments
ha_innodb.cc:
  Partial fix for Bug #12263 : we let InnoDB always to perform a rollback on the trx object if MySQL closes a connection; but we do print a warning to the .err log if an InnoDB transaction was active; we may remove that print later, since the situation really is not a bug; MySQL just is not aware that some cursor operation started an InnoDB transaction
 2005-08-03 17:09:21 +03:00
evgen@moonbone.local
05d4c0c748 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11934
 2005-08-03 14:14:02 +04:00
sergefp@mysql.com
31a73da815 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-sp-no-lock-r7
 2005-08-03 10:14:01 +00:00
sergefp@mysql.com
0fc51d2003 Fixed comment 2005-08-03 10:12:31 +00:00
sergefp@mysql.com
f595847ec0 Manual merge 2005-08-03 03:47:07 +00:00
sergefp@mysql.com
b6a6fe0849 Prelocking-free SPs, post-review fixes: 
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
 2005-08-03 03:37:32 +00:00
jimw@mysql.com
6557fca0bd Update out-of-date test result 2005-08-02 18:27:05 -07:00
jimw@mysql.com
de46ae18c2 Merge mysql.com:/home/jimw/my/mysql-5.0-11602 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:12 -07:00
jimw@mysql.com
42b5135c84 Merge mysql.com:/home/jimw/my/mysql-5.0-11568 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:11 -07:00
jimw@mysql.com
698f209917 Fix test to avoid spurious failure message. (Bug #11233) 2005-08-02 16:50:10 -07:00
jimw@mysql.com
97797d91fb Merge mysql.com:/home/jimw/my/mysql-5.0-7003 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:09 -07:00
igor@rurik.mysql.com
2b70615913 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into rurik.mysql.com:/home/igor/mysql-5.0
 2005-08-02 16:50:08 -07:00
reggie@fedora.(none)
316eff7a8e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  fedora.(none):/home/reggie/bk/mysql-5.0
 2005-08-02 18:50:07 -05:00
reggie@fedora.(none)
5a0250c349 Conversions of dsp files to vcproj. These files are compatible with 
Visual Studio 2003.  I have not yet changed the windows build scripts
to use these.
 2005-08-02 18:47:02 -05:00
jimw@mysql.com
71a0d0ad4c Make lowercase_table3 get skipped on Windows, as intended. (Bug #11568) 2005-08-02 15:58:41 -07:00
reggie@fedora.(none)
3beab00b21 fix VC compile error 2005-08-02 17:25:40 -05:00
evgen@moonbone.local
706247caae Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client 
Bug was introduced by cset 1.1659.14.1. Before it server was silently
ignoring that lock can't be acquired because it already acquired.

This patch makes make_global_read_lock_block_commit() return without error
if lock already acquired.
 2005-08-03 02:01:27 +04:00
igor@rurik.mysql.com
7322441dc7 Manual merge 2005-08-02 13:17:49 -07:00
igor@rurik.mysql.com
5e851429de item_sum.cc: 
Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
  Added my comment.
 2005-08-02 13:12:41 -07:00
igor@rurik.mysql.com
b5f33d2bc4 Manual merge 2005-08-02 12:09:49 -07:00
igor@rurik.mysql.com
8420d76f8d sql_select.cc, sql_class.h: 
Reversed the changes to fix bug #12095 after review
  done by SergeyG. Applied a fix suggested by him.
 2005-08-02 11:58:52 -07:00
lenz@mysql.com
1e2e10afac Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-08-02 14:16:09 +02:00
lenz@mysql.com
2889025acc Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-08-02 14:04:21 +02:00
lenz@mysql.com
9217c90a77 - Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list all 
required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.
 2005-08-02 13:59:02 +02:00
svoj@mysql.com
007de019ce Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/BUG12075/mysql-4.1
 2005-08-02 14:28:30 +05:00
svoj@mysql.com
315e4efc3f Fix for BUG#12075. 
FULLTEXT non-functional for big5 strings
 2005-08-02 14:27:52 +05:00
svoj@mysql.com
a4d6113d22 After merge fix. 2005-08-02 12:57:26 +05:00
svoj@mysql.com
0f98bf44ef Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0 
into  mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1
 2005-08-02 12:12:37 +05:00
svoj@mysql.com
19fe33e16c BUG#11684 fix. 
Repair crashes mysql when table has fulltext index.
 2005-08-02 11:33:26 +05:00
jimw@mysql.com
fb903c1e2c Fix two test results that were merged out-of-order. 2005-08-01 19:21:56 -07:00
jimw@mysql.com
48d111c8c2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-01 17:54:57 -07:00
jimw@mysql.com
ca56883011 Merge mysql.com:/home/jimw/my/mysql-4.1-9947 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:12:30 -07:00
jimw@mysql.com
c3e40306b7 Merge mysql.com:/home/jimw/my/mysql-4.1-11402 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:11:49 -07:00
jimw@mysql.com
9a5560683f Merge mysql.com:/home/jimw/my/mysql-4.1-10724 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:10:35 -07:00
jimw@mysql.com
8d591d0189 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-01 17:08:38 -07:00
jimw@mysql.com
4cf8696eae Fix crash in 'INSERT DELAYED' statement that failed due to a 
conflict in a unique key. (Bug #12226)
 2005-08-01 17:00:03 -07:00
jimw@mysql.com
ea7df08c93 Fix crash in 'SHOW CREATE FUNCTION' introduced by Monty's last 
cleanup.
 2005-08-01 15:43:40 -07:00
reggie@fedora.(none)
25e204debb fix compile warning in Visual Studio 2003 2005-08-01 17:07:19 -05:00
sasha@asksasha.com
3055ce9ecc Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-01 13:34:04 -06:00
mskold@mysql.com
5d3b406799 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-01 12:05:52 +02:00
mskold@mysql.com
cc62018ff6 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-release 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-01 11:52:07 +02:00
mskold@mysql.com
0f0fb8a05a Fixed handling of NOT LIKE after Item_func::NOTLIKE_FUNC has been removed 2005-08-01 11:50:43 +02:00
schwenke@alpha.xl.local
655a86a9e7 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
 2005-08-01 08:34:29 +02:00
monty@mishka.local
7f845036c0 After merge fixes 
Review of new pushed code
 2005-07-31 22:56:24 +03:00
mskold@mysql.com
d969a9ab68 Fix for bug#12021 2005-07-31 21:33:46 +02:00
monty@mishka.local
585da2f6fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-31 21:09:18 +03:00
schwenke@alpha.xl.local
84c5ce61c5 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
 2005-07-31 19:59:20 +02:00
igor@rurik.mysql.com
da33db7558 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-07-31 04:33:15 -07:00
igor@rurik.mysql.com
9ee6e8c147 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-07-31 04:29:34 -07:00
igor@rurik.mysql.com
620f865cbb null_key.result, null_key.test: 
Modified test case for bug #12144.
 2005-07-31 04:28:01 -07:00