mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25303 commits 2781 branches 343 tags 1.6 GiB
Commit graph

25303 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
f58e5033fb Skip two tests that fail on Windows that just reflect limitations of 
that platform, not real failures. (Bug #12328, Bug #11569)
 2005-08-03 17:38:55 -07:00
georg@lmy002.wdf.sap.corp
e5514f361a Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-08-04 02:07:53 +02:00
georg@lmy002.wdf.sap.corp
aa044ab57a Changed/fixed error message from last commit 2005-08-04 02:06:21 +02:00
kent@mysql.com
8c72a876d1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-04 01:20:36 +02:00
kent@mysql.com
6a69fd6102 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-04 00:45:24 +02:00
reggie@fedora.(none)
8cb3bd41c8 alot of formatting changes that came out of JimW's review 2005-08-03 16:20:27 -05:00
elliot@mysql.com
48ded4ab3d Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-08-03 16:15:05 -04:00
elliot@mysql.com
fc5829d651 BUG#12330 Adding updated result file which I missed in last changeset. 
Adds --replace_column to make test results deterministic.
 2005-08-03 16:12:06 -04:00
elliot@mysql.com
68b9b8802b Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-08-03 15:30:33 -04:00
elliot@mysql.com
84896da641 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
 2005-08-03 15:24:18 -04:00
elliot@mysql.com
96dd197dd1 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 
into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug12330
 2005-08-03 15:20:21 -04:00
elliot@mysql.com
fcaff839de BUG#12330 Add --replace_column in order to make test deterministic. 2005-08-03 15:08:03 -04:00
joerg@mysql.com
3af1cec51b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-08-03 20:11:06 +02:00
joerg@mysql.com
595e4ec3db Manual merge: Current 4.1.14 has precedence over 4.1.10b 2005-08-03 20:03:21 +02:00
lenz@mysql.com
7ce49334f8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2005-08-03 19:52:38 +02:00
lenz@mysql.com
e487aad9c9 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-08-03 19:44:47 +02:00
heikki@hundin.mysql.fi
2895faed9f Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into  hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-08-03 19:03:50 +03:00
heikki@hundin.mysql.fi
ff111df4f1 Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into  hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-08-03 18:58:43 +03:00
heikki@hundin.mysql.fi
7e588ac074 ha_innodb.cc: 
Fix compilation error in the fix of Bug #12263
 2005-08-03 18:53:22 +03:00
heikki@hundin.mysql.fi
353b3a2cad ha_innodb.cc: 
Fix compilation error in previous commit
 2005-08-03 18:47:50 +03:00
heikki@hundin.mysql.fi
34e9cdd500 Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into  hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-08-03 18:30:24 +03:00
heikki@hundin.mysql.fi
82b2a0a366 buf0buf.c: 
Fix a bug: InnoDB could in a crash recovery print a big false corruption warning if the first page of an ibdata file was 'recreated' in the buffer pool; this could happen, for example, if a table was dropped, and the page used later
 2005-08-03 18:21:38 +03:00
heikki@hundin.mysql.fi
d1562a13dd Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into  hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-08-03 18:18:43 +03:00
heikki@hundin.mysql.fi
c9c6b82404 ha_innodb.cc: 
Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)
 2005-08-03 18:11:55 +03:00
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
hf@deer.(none)
a64c9aae3a Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0.10226
 2005-08-03 18:09:05 +05:00
lenz@mysql.com
eab37e1df3 Merge mysql.com:/data0/mysqldev/lenz/mysql-4.1 
into mysql.com:/data0/mysqldev/lenz/mysql-5.0
 2005-08-03 14:17:31 +02:00
lenz@mysql.com
6893e5969a Portability fixes: 
- Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
   compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) in ndb/src/common/portlib/NdbMutex.c
   and ndb/src/common/portlib/NdbThread.c
 - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll() in 
   ndb/tools/config.cpp
 2005-08-03 13:46:38 +02: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
georg@lmy002.wdf.sap.corp
812ea21748 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-08-03 07:36:06 +02:00
georg@lmy002.wdf.sap.corp
7251e9dbd8 Fix for bug #6859 (after Sanja's review) 
Added check which throws ER_WRONG_OBJECT error in case the .frm
doesn't contain a valid table type (e.g. view or trigger)
 2005-08-03 07:29:48 +02: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