Commit graph

23186 commits

Author SHA1 Message Date
gluh@eagle.intranet.mysql.r18.ru
26e9e13c26 Fix for bug #9992: mysql_next_result hangs on error
set net->no_send_error to 0 before execution of each element of
    multiquery statement to provide the sending of error to client
2005-05-27 18:01:09 +05:00
dlenev@mysql.com
eaa7f6ab88 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-ttdf
2005-05-27 14:38:34 +04:00
dlenev@brandersnatch.localdomain
0ef3267251 Fix for trigger.test failure in --debug mode.
We can't have Item_trigger_field as aggregated object inside of
sp_instr_set_trigger_field class since in this case its destructor
will be called twice. So instead let us create this Item separately
and store pointer to it in instruction object.
2005-05-27 14:15:17 +04:00
msvensson@neptunus.(none)
3490108235 Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1 2005-05-27 12:03:37 +02:00
msvensson@neptunus.(none)
aa99b05be7 Fix rpl_log and rpl_rotate_logs test result
- Remove the expected warrnings when "show binary logs" are called on zero size binary log files.
2005-05-27 12:01:41 +02:00
msvensson@neptunus.(none)
ed6b9812f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-27 10:10:16 +02:00
monty@mysql.com
f8cb00640f Fix broken test case (after merge) 2005-05-26 23:33:20 +03:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02: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)
6c00006d2c Fix icc compiler warning 2005-05-26 12:12:36 +02:00
msvensson@neptunus.(none)
975ca22872 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
83d430353e Add ifdefs to control when "#pragma implementation" should be used
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +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
monty@mysql.com
6d5d6c9257 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-05-25 12:57:29 +03:00
monty@mysql.com
fb90aaa7b5 Cleanup during code review
Faster detection of wrong table names (like PRN) on windows
2005-05-25 12:56:47 +03: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
msvensson@neptunus.(none)
0ed2e57731 Use one err file for each master 2005-05-25 11:10:10 +02: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