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

23174 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
7538ce70d5 Fixed bug in multiple-table-delete where some rows was not deleted 2005-05-30 20:48:40 +03:00
monty@mysql.com
f8cb00640f Fix broken test case (after merge) 2005-05-26 23:33:20 +03:00
msvensson@neptunus.(none)
90f971ae2c Include fix to function open_binlog from 4.1 
- Add O_SHARE when opening file.
 2005-05-26 21:01:54 +02:00
sergefp@mysql.com
59db44382b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-conf-fixes-2
 2005-05-26 21:01:53 +02:00
sergefp@mysql.com
41c8f46160 Post-review fixes: rename SHOW_DOUBLE to SHOW_DOUBLE_STATUS 2005-05-26 20:54:02 +02:00
joerg@mysql.com
5178c84bef Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-05-26 18:12:56 +02:00
joerg@mysql.com
76b25fc194 Corrected merge error in 'mysql-test/r/select.result': two test blocks inserted in wrong order. 2005-05-26 16:47:44 +02:00
monty@mysql.com
3f17e9a4e3 Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0 2005-05-26 15:20:27 +03:00
monty@mysql.com
206c0ebbc3 Moved detection of wrong decimal fields before decimal field was created to avoid ASSERT() for DECIMAL(1) 2005-05-26 14:00:47 +03:00
joerg@mysql.com
4572248a84 Correction of merge mishandling in 'client/client_priv.h'. 2005-05-26 12:58:55 +02:00
joerg@mysql.com
f39f049041 Merge 2005-05-26 12:55:31 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
msvensson@neptunus.(none)
676ba73480 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-26 11:37:19 +02:00
msvensson@neptunus.(none)
f3cc29e93b Fix compiler warning 2005-05-26 11:36:01 +02:00
msvensson@neptunus.(none)
128074d91a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/bug9879
 2005-05-26 11:25:25 +02:00
kent@mysql.com
e2955a2f13 init_db.sql: 
Updated test data in system tables
 2005-05-26 02:07:13 +02:00
kent@mysql.com
3d4a494189 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-05-26 01:38:29 +02:00
jimw@mysql.com
5905598e16 Fix MERGE tables on Microsoft Windows. This a backport of the 
fix from the main 5.0 tree. (Bug #10687)
 2005-05-25 14:41:50 -07:00
monty@mysql.com
7daf98db15 Move function from header file to make it easier to debug 2005-05-26 00:18:24 +03:00
monty@mysql.com
dac499ce7c Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0 2005-05-25 19:55:01 +03:00
tulin@mysql.com
60d2723930 Merge mysql.com:/data0/mysqldev/my/mysql-5.0-build 
into mysql.com:/data0/mysqldev/tomas/mysql-5.0-build
 2005-05-25 18:54:47 +02:00
joerg@mysql.com
830d25d985 Manual merge. 2005-05-25 18:11:03 +02:00
tulin@mysql.com
264de67fc6 Bug #10838 CREATE TABLE produces strange DEFAULT value 2005-05-25 17:54:36 +02:00
monty@mysql.com
dab33061ff Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-25 18:38:29 +03:00
monty@mysql.com
cb7cd33222 Fix that we can read tables with the 'older' decimal format used in 5.0.3 & 5.0.4 
We will however give a warning when opening such a table that users should use ALTER TABLE ... FORCE to fix
the table. In future release we will fix that REPAIR TABLE will be able to handle this case
 2005-05-25 18:33:36 +03:00
monty@mysql.com
5f8f947f34 Cleanup's during review 
Added ASSERT() to detect wrongly packed fields
 2005-05-25 18:33:32 +03:00
joerg@mysql.com
0d121fe01a Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken. 
(bug#10674, bug#10681)
 2005-05-25 16:24:07 +02:00
svoj@mysql.com
b763679f1c WL#2286 - Compile MySQL w/YASSL support 
Merge with latest yaSSL, fix compilation error for SSE2 processors.
 2005-05-25 19:11:36 +05:00
marko@hundin.mysql.fi
5a8cfc1541 srv0start.c: 
innobase_shutdown_for_mysql(): Do very fast shutdown
  only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0
  (Bug #9673)
 2005-05-25 12:41:57 +03:00
stewart@mysql.com
119e500c80 BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properly 2005-05-25 15:35:51 +10:00
stewart@mysql.com
274fee09c9 BUG#10796 Incorrect check-cpu result for ppc linux gcc 2005-05-25 12:18:18 +10:00
acurtis@xiphis.org
248a6934bb Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0 
into xiphis.org:/usr/home/antony/work2/p3-bug7241.6
 2005-05-24 22:51:02 +01:00
acurtis@xiphis.org
9c8b4c93bb Fix after merge 2005-05-24 22:31:57 +01:00
Sinisa@sinisa.nasamreza.org
e94f4fa8e0 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-05-24 22:44:18 +03:00
dlenev@mysql.com
b92c9f1424 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-bg5860
 2005-05-24 23:39:25 +04:00
svoj@mysql.com
bc6371a998 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-05-25 00:27:38 +05:00
svoj@mysql.com
1dabee5aad Upgrade yaSSL to 0.9.9. 2005-05-25 00:15:06 +05:00
serg@serg.mylan
4290e7c73a Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-05-24 21:06:45 +02:00
serg@serg.mylan
e2c8f63ed4 simplifying new/my_arg_new wrapping 2005-05-24 21:02:42 +02:00
dlenev@mysql.com
1449d44e1c Manual merge of patch fixing several trigger related bugs with main tree. 2005-05-24 22:35:41 +04:00
dlenev@brandersnatch.localdomain
007a205918 Fix for bugs: 
#5860 "Multi-table UPDATE does not activate update triggers"
 #6812 "Triggers are not activated for INSERT ... SELECT"
 #8755 "Trigger is not activated by LOAD DATA".
This patch also implements proper handling of triggers for special forms
of insert like REPLACE or INSERT ... ON DUPLICATE KEY UPDATE. 
Also now we don't call after trigger in case when we have failed to
inserted/update or delete row. Trigger failure should stop statement
execution.

I have not properly tested handling of errors which happen inside of
triggers in this patch, since it is simplier to do this once we will be
able to access tables from triggers.
 2005-05-24 22:19:33 +04:00
brian@zim.(none)
46a3eef67d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zim.(none):/home/brian/mysql/mysql-4.1
 2005-05-24 10:48:03 -07:00
kent@mysql.com
bedc2e3d4c ha_archive.cc: 
Use local seach path for "mysql_priv.h"
mysqld.dsp:
  Added the ARCHIVE storage engine to max
ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String
 2005-05-24 18:51:53 +02:00
Sinisa@sinisa.nasamreza.org
df53be3dfe Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-05-24 19:47:18 +03:00
jani@ua141d10.elisa.omakaista.fi
ed2e508bdd Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
 2005-05-24 18:23:31 +03:00
acurtis@xiphis.org
4a77febaab Merge 2005-05-24 15:52:48 +01:00
jani@ua141d10.elisa.omakaista.fi
5254d52cb6 Added a test case for Bug#8009. 2005-05-24 17:50:17 +03:00
reggie@mdk10.(none)
0f43a4719e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/41test2
 2005-05-24 09:02:56 -05:00
reggie@mdk10.(none)
6726b9fd09 removed unneeded reserved_win_names testcase 2005-05-24 09:01:06 -05:00
acurtis@xiphis.org
565c20ecbf Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/usr/home/antony/work2/p3-bug7241.5
 2005-05-24 13:40:25 +01:00