mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22342 commits 2790 branches 343 tags 1.7 GiB
Commit graph

10687 commits

Author SHA1 Message Date
hf@deer.(none)
c2339a6ff0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.spaerrs
 2005-04-29 20:26:11 +05:00
hf@deer.(none)
054463f975 Fix for #6553 and #8776 (no errors on bad spatial data) 2005-04-29 20:23:02 +05:00
ingo@mysql.com
673ef90a1b Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 14:56:04 +02:00
mskold@mysql.com
a248774682 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 14:16:41 +02:00
ingo@mysql.com
fea20f9f18 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 12:54:15 +02:00
mskold@mysql.com
607b1a9987 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 11:53:35 +02:00
mskold@mysql.com
aed38a0f49 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-29 11:49:54 +02:00
mskold@mysql.com
2428e7b1cc Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug 2005-04-29 11:37:47 +02:00
heikki@hundin.mysql.fi
1e6dba4d88 ha_innodb.cc: 
Fix compilation error on Windows in innobase_report_binlog_offset_and_commit()
 2005-04-29 12:11:04 +03:00
ingo@mysql.com
e465c0e0f3 BUG#5964 - 4.1 MERGE tables regression from 4.0 
After merge fix.
 2005-04-29 10:59:34 +02:00
ingo@mysql.com
de613e6b3d Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-29 09:05:37 +02:00
sergefp@mysql.com
908c5d74d4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug9821
 2005-04-29 02:52:20 +04:00
ingo@mysql.com
be34b54e1d Merge mysql.com:/home/mydev/mysql-4.1-4100 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-28 19:34:05 +02:00
sergefp@mysql.com
e31b850937 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
 2005-04-28 21:05:26 +04:00
ingo@mysql.com
8ccbea47e8 Merge mysql.com:/home/mydev/mysql-4.1-bug5964 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-04-28 18:34:47 +02:00
ingo@mysql.com
1f0d0a6729 BUG#5964 - 4.1 MERGE tables regression from 4.0 
Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.
 2005-04-28 18:28:50 +02:00
msvensson@neptunus.(none)
5de370c534 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-28 13:32:52 +02:00
msvensson@neptunus.(none)
f78e1d1c44 Merge 2005-04-28 10:58:24 +02:00
mskold@mysql.com
78263507ab Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-28 10:57:08 +02:00
msvensson@neptunus.(none)
6b3e3b03d3 Merge neptunus.(none):/home/msvensson/mysql/bug9911 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-28 10:50:31 +02:00
msvensson@neptunus.(none)
9969e1c5ea BUG#9911 After review fixes 
- Remove ha_archive::rename_table and move the fix to handler::rename_table
 2005-04-28 10:49:18 +02:00
mskold@mysql.com
69c17fe46c Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-04-28 10:48:08 +02:00
mskold@mysql.com
92dc45c86f Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes 2005-04-28 10:46:39 +02:00
mskold@mysql.com
47c2c96379 Merge 2005-04-28 10:28:56 +02:00
mskold@mysql.com
bbee23435d Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes 2005-04-28 09:39:29 +02:00
ingo@mysql.com
8ca745be65 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-04-27 23:00:17 +02:00
ingo@mysql.com
731c8da030 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 
After merge fix.
 2005-04-27 22:58:11 +02:00
msvensson@neptunus.(none)
1ba85ac979 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error 
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.
 2005-04-27 22:20:58 +02:00
msvensson@neptunus.(none)
bdb1441a65 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-27 21:40:11 +02:00
ingo@mysql.com
15f9556ca2 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 
Merge from 4.1
 2005-04-27 21:02:38 +02:00
ingo@mysql.com
1df110057c Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 
After merge fix.
 2005-04-27 20:54:19 +02:00
sergefp@mysql.com
4732c3b516 Merge mysql.com:/home/psergey/mysql-4.1-bug9298 
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
 2005-04-27 22:49:42 +04:00
ingo@mysql.com
235d2295da Merge from 4.0 needs fixes 2005-04-27 18:59:31 +02:00
msvensson@neptunus.(none)
c76c23fcbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-27 18:28:57 +02:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
mskold@mysql.com
96b42c1241 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-27 17:12:08 +02:00
pem@mysql.comhem.se
f769a7a8b0 Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW 
(Review on irc by monty)
 2005-04-27 16:35:49 +02:00
joerg@mysql.com
4f1a696f9a Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-04-27 15:50:11 +02:00
ramil@mysql.com
82fc2ce8b7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/ram/work/4.1.b9803
 2005-04-27 17:20:29 +05:00
pem@mysql.com
79cf164767 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-27 14:10:33 +02:00
heikki@hundin.mysql.fi
ce2c8126a2 handler.cc: 
Fix compilation error if HAVE_REPLICATION is not defined
 2005-04-27 15:09:41 +03:00
georg@lmy002.wdf.sap.corp
9838ec71db Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-04-27 14:09:40 +02:00
georg@lmy002.wdf.sap.corp
09a30f913b Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0-build 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-04-27 14:07:58 +02:00
georg@lmy002.wdf.sap.corp
7d6c12313e fix for compile error (Windows) 2005-04-27 13:54:42 +02:00
pem@mysql.com
0290afcdb7 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-04-27 13:24:40 +02:00
msvensson@neptunus.(none)
203cdde955 Merge from 4.1 to 5.0 2005-04-27 12:56:01 +02:00
heikki@hundin.mysql.fi
af00b989df ha_innodb.cc: 
Correct an assertion
 2005-04-27 13:43:02 +03:00
ingo@mysql.com
0998abc831 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock 
Added protection against global read lock while creating and
initializing a delayed insert handler.
Allowed to ignore a global read lock when locking the table
inside the delayed insert handler.
Added some minor improvements.
 2005-04-27 12:40:37 +02:00
heikki@hundin.mysql.fi
ab0dbb1fc6 ha_innodb.cc, mysqld.cc: 
Fix compilation error if HAVE_REPLICATION is not defined
 2005-04-27 13:36:58 +03:00
msvensson@neptunus.(none)
2627475a86 Merge neptunus.(none):/home/msvensson/mysql/bug9714 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-04-27 12:30:11 +02:00