Commit graph

40074 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
0cbb309b1a ndb - valgrind
Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)
2006-10-27 16:32:59 +02:00
msvensson@neptunus.(none)
abc1c05449 Update the rules for abi_check 2006-10-27 15:57:00 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6ee81f0ed Fix for bug : delete rows with null date field
Backport of the fix for bug : A date with value 0 is treated as a NULL value
2006-10-27 18:08:50 +05:00
kroki/tomash@moonlight.intranet
43e84da003 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584
2006-10-27 13:47:45 +04:00
kroki/tomash@moonlight.intranet
db952c2faa Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug22584
2006-10-27 13:40:28 +04:00
kroki/tomash@moonlight.intranet
0e0f7a0423 BUG#22584: last_insert_id not updated after inserting a record through
a updatable view.

When there's a VIEW on a base table that have AUTO_INCREMENT column, and
this VIEW doesn't provide an access such column, after INSERT to such
VIEW LAST_INSERT_ID() did not return the value just generated.

This behaviour is intended and correct, because if the VIEW doesn't list
some columns then these columns are effectively hidden from the user,
and so any side effects of inserting default values to them.

However, there was a bug that such statement inserting into a view would
reset LAST_INSERT_ID() instead of leaving it unchanged.

This patch restores the original value of LAST_INSERT_ID() instead of
resetting it to zero.
2006-10-27 13:32:41 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6995d2f29f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22158/my50-bug22158
2006-10-27 14:14:57 +05:00
ramil/ram@myoffice.izhnet.ru
36bd757216 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/usr/home/ram/work/bug22158/my51-bug22158
2006-10-27 12:10:53 +05:00
ramil/ram@myoffice.izhnet.ru
9f1a271c70 Merge mysql.com:/usr/home/ram/work/bug22158/my50-bug22158
into  mysql.com:/usr/home/ram/work/bug22158/my51-bug22158
2006-10-27 08:59:56 +05:00
msvensson@neptunus.(none)
4aa5a91b20 Merge bk-internal:/home/bk/mysql-5.1-new-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-27 00:00:00 +02:00
msvensson@neptunus.(none)
65ab78fe3c Update for 5.1 2006-10-26 23:59:00 +02:00
msvensson@neptunus.(none)
6e70b126ed Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-26 22:54:25 +02:00
msvensson@neptunus.(none)
00fbaf07d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-26 22:25:45 +02:00
msvensson@neptunus.(none)
b5b39a4afb Bug#23427 incompatible ABI change in 5.0.26?
- Improve icheck rules in Makefile.am
2006-10-26 22:20:43 +02:00
iggy/Administrator@amd64.
c5960a9818 Post Merge Cleanup 2006-10-26 15:41:47 -04:00
msvensson@neptunus.(none)
7946e8c3c8 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-26 20:11:13 +02:00
msvensson@neptunus.(none)
74a29e5db4 Bug#20894 Reproducible MySQL client segmentation fault
- Add two null bytes in  "buff" variable allowing us to call
   get_arg two times also for strings longer than sizeof(buff)
2006-10-26 19:51:29 +02:00
msvensson@neptunus.(none)
a4d350e5ff Merge 192.168.0.4:mysql/my51-m-bug18888
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-26 19:15:47 +02:00
msvensson@shellback.(none)
631c82d2ea Bug#18888 Trying to overwrite sql/lex_hash.h during build
- As a sideeffect of the patch to generate lex_hash.h only once
on the machine where the source dist was produced, a problem
was found when compiling a mysqld without partition support - it 
would crash when looking up the lex symbols due to mismatch between
lex.h and the generated lex_hash.h

 - Remove the ifdef for partition in lex.h 
 - Fix minor problem with"EXPLAIN PARTITION" when not compiled with
   partition(existed also without the above patch)
 - Add test case that will be run when we don't have partition
   support compiled into mysqld
 - Return error ER_FEATURE_DISABLED if user tries to use PARTITION
   when there is no support for it.
2006-10-26 19:11:09 +02:00
msvensson@neptunus.(none)
da2a6911d9 Bug SP: DROP PROCEDURE|VIEW (maybe more) write to binlog too late (race cond)
- Rmove duplicate code to log a "DROP VIEW..", must be a merge miss
2006-10-26 18:34:24 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
7b90a45425 Fix for bug : Errors in init_connect terminate connections silently
When executing the init_connect statement, thd->net.vio is set to 0, to         
forbid sending any results to the client. As a side effect we don't log         
possible errors, either.                                                        
                                                                                
Now we write warnings to the error log if an init_connect query                
fails.
2006-10-26 14:51:34 +05:00
tsmith/tim@siva.hindu.god
394ad97562 BitKeeper/triggers/*crash-protect.pl: Don't print messages if nothing is wrong. 2006-10-25 18:51:50 -06:00
tsmith/tim@siva.hindu.god
837fb44170 Merge siva.hindu.god:/usr/home/tim/m/bk/50
into  siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-25 17:14:32 -06:00
tsmith/tim@siva.hindu.god
514fd098f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-25 16:28:42 -06:00
pekka@orca.ndb.mysql.com
7236064342 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
2006-10-25 21:03:01 +02:00
kroki/tomash@moonlight.intranet
25501c38d3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
2006-10-25 20:23:41 +04:00
kroki/tomash@moonlight.intranet
99baff565e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
2006-10-25 20:16:39 +04:00
kroki/tomash@moonlight.intranet
fa60a03073 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
2006-10-25 20:13:07 +04:00
kroki/tomash@moonlight.intranet
eeaa7f6638 After merge fix. 2006-10-25 20:12:23 +04:00
kroki/tomash@moonlight.intranet
7d3b9ffb65 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
2006-10-25 20:10:12 +04:00
kroki/tomash@moonlight.intranet
2c03444971 Fix after manual merge. 2006-10-25 20:09:31 +04:00
kroki/tomash@moonlight.intranet
c8bb2f396a Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
2006-10-25 20:00:51 +04:00
kroki/tomash@moonlight.intranet
b7b991cec3 BUG#18819: DELETE IGNORE hangs on foreign key parent delete
If the error happens during DELETE IGNORE, nothing could be send to the
client, thus leaving it frozen expecting the reply.

The problem was that if some error occurred, it wouldn't be reported to
the client because of IGNORE, but neither success would be reported.

MySQL 4.1 would not freeze the client, but will report

  ERROR 1105 (HY000): Unknown error

instead, which is also a bug.

The solution is to report success if we are in DELETE IGNORE and some
non-fatal error has happened.
2006-10-25 19:53:26 +04:00
pekka@orca.ndb.mysql.com
0dac23f627 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
2006-10-25 17:32:32 +02:00
pekka@orca.ndb.mysql.com
00db3c9982 ndb - dbtux: remove redundant code line (no functional change) 2006-10-25 17:30:30 +02:00
msvensson@neptunus.(none)
75517b89bc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-25 16:52:27 +02:00
msvensson@neptunus.(none)
6665d67e3f Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-25 16:51:32 +02:00
msvensson@neptunus.(none)
8f118827c4 Skip innodb test if mysqld doesn't have innodb support 2006-10-25 16:50:06 +02:00
msvensson@neptunus.(none)
4d8eda1303 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-25 16:27:36 +02:00
msvensson@neptunus.(none)
eab6dbceab Fix memory leaks found when valgrinding mysql_client_test
Remove one warning
2006-10-25 16:26:57 +02:00
msvensson@neptunus.(none)
30c755c21e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-25 15:43:40 +02:00
msvensson@neptunus.(none)
e193c7bf87 Test failure when compiled without innodb
Disable warnings around the create table statements, we want to use innodb when possible but they work just fine without.
2006-10-25 15:41:32 +02:00
mskold/marty@mysql.com/linux.site
bf365af0bd Bug Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings 2006-10-25 15:34:47 +02:00
mskold/marty@linux.site
c845b3e139 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-25 15:22:47 +02:00
mskold/marty@mysql.com/linux.site
7ad30e80f1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-10-25 15:17:44 +02:00
msvensson@neptunus.(none)
31d15fbefc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-25 14:59:54 +02:00
msvensson@neptunus.(none)
8ce354f3cf Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-25 14:57:06 +02:00
msvensson@neptunus.(none)
de932f2a5f Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified 2006-10-25 14:56:36 +02:00
msvensson@neptunus.(none)
0f25306ab3 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-25 14:43:08 +02:00
msvensson@neptunus.(none)
86cca50848 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-25 14:39:29 +02:00