mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39972 commits 2794 branches 343 tags 1.5 GiB
Commit graph

39972 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
69f3bb67f5 Bug #14262 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 


sql/sql_view.cc:
  The query should only be logged to binlog once and that is if the drop didn't produce any errors
  Removing the duplicate as that must have been a merge error
 2006-10-26 18:34:24 +02:00
unknown
ac2f1cca69 Fix for bug #22158: 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.                                                                          


sql/sql_parse.cc:
  Fix for bug #22158: Errors in init_connect terminate connections silently
  - raise warnings if the init_connect execution fails.
 2006-10-26 14:51:34 +05:00
unknown
83ebd23ee9 BitKeeper/triggers/*crash-protect.pl: Don't print messages if nothing is wrong. 
BitKeeper/triggers/pre-outgoing.crash-protect.pl:
  Don't print message if nothing is wrong.
BitKeeper/triggers/pre-resolve.crash-protect.pl:
  Don't print message if nothing is wrong.
 2006-10-25 18:51:50 -06:00
unknown
0143039bc9 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51


configure.in:
  Use local
BitKeeper/deleted/.del-CMakeLists.txt~1:
  Use local
BitKeeper/deleted/.del-make_win_bin_dist:
  Use local
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/view.test:
  SCCS merged
mysys/mf_iocache.c:
  Auto merged
sql/item_func.cc:
  SCCS merged
sql/opt_range.cc:
  SCCS merged
sql/opt_range.h:
  SCCS merged
sql/sql_lex.cc:
  SCCS merged
sql/sql_lex.h:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged
sql/table.cc:
  SCCS merged
storage/myisam/sort.c:
  Use local
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
 2006-10-25 17:14:32 -06:00
unknown
1444edfcef Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/50


configure.in:
  Auto merged
 2006-10-25 16:28:42 -06:00
unknown
01ddbfa657 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
unknown
b67bb25408 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/sql_delete.cc:
  Auto merged
 2006-10-25 20:23:41 +04:00
unknown
853fb1ebfe Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
sql/sql_delete.cc:
  Auto merged
 2006-10-25 20:16:39 +04:00
unknown
722d433018 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
unknown
f132d192de After merge fix. 2006-10-25 20:12:23 +04:00
unknown
f62faee964 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819


mysql-test/r/innodb_mysql.result:
  Auto merged
sql/sql_delete.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
 2006-10-25 20:10:12 +04:00
unknown
6137ef86a9 Fix after manual merge. 2006-10-25 20:09:31 +04:00
unknown
99530d8aee Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


myisam/mi_open.c:
  Auto merged
 2006-10-25 18:07:07 +02:00
unknown
e171a36efb Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819


mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.
 2006-10-25 20:00:51 +04:00
unknown
e3d49f0c3f 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.


mysql-test/r/innodb_mysql.result:
  Add result for bug#18819: DELETE IGNORE hangs on foreign key parent
  delete.
mysql-test/t/innodb_mysql.test:
  Add test case for bug#18819: DELETE IGNORE hangs on foreign key parent
  delete.
sql/sql_delete.cc:
  Report success if we have got an error, but we are in DELETE IGNORE, and
  the error is not fatal (if it is, it would be reported to the client).
 2006-10-25 19:53:26 +04:00
unknown
60b5420bff 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


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
 2006-10-25 17:32:32 +02:00
unknown
1104ff49c9 ndb - dbtux: remove redundant code line (no functional change) 
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  remove redundant unpackBound call, missed in previous patch
 2006-10-25 17:30:30 +02:00
unknown
36296ca91d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
 2006-10-25 17:12:09 +02:00
unknown
a0efc901bb Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


myisam/mi_open.c:
  Auto merged
sql/slave.cc:
  Auto merged
 2006-10-25 17:10:18 +02:00
unknown
2ab335a5b8 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge


myisam/mi_open.c:
  Auto merged
 2006-10-25 17:08:57 +02:00
unknown
67dcfc3e87 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
 2006-10-25 16:52:27 +02:00
unknown
060f4196af Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
 2006-10-25 16:51:32 +02:00
unknown
5decebc5f3 Skip innodb test if mysqld doesn't have innodb support 2006-10-25 16:50:06 +02:00
unknown
b01f3e5c82 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


tests/mysql_client_test.c:
  Auto merged
 2006-10-25 16:27:36 +02:00
unknown
e6440d1336 Fix memory leaks found when valgrinding mysql_client_test 
Remove one warning


tests/mysql_client_test.c:
  Fix memory leaks
  Remove one warning
 2006-10-25 16:26:57 +02:00
unknown
fbe23ac98e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/ctype_utf8.test:
  Auto merged
 2006-10-25 15:43:40 +02:00
unknown
bf6e47f8c4 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.


mysql-test/t/ctype_utf8.test:
  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
unknown
62324a4426 Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings 2006-10-25 15:34:47 +02:00
unknown
17649b5f6c 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
unknown
81e4c2fb08 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
unknown
65b8a0e347 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Use remote version of mysql-test-run.pl
 2006-10-25 14:59:54 +02:00
unknown
e402af83f5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-10-25 14:57:06 +02:00
unknown
7596e12bbe 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
unknown
90e4aad9ad Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
 2006-10-25 14:43:08 +02:00
unknown
5b29efafa5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
tests/mysql_client_test.c:
  Use local in 5.0
 2006-10-25 14:39:29 +02:00
unknown
870ed0c3f5 Add valgrinding support for mysql_client_test 
Fix two memory leaks in mysql_client_test


mysql-test/mysql-test-run.pl:
  Add valgrinding support for mysql_client_test
tests/mysql_client_test.c:
  Fix two memory leaks
 2006-10-25 14:34:18 +02:00
unknown
6a8dcca4c6 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-10-25 13:18:03 +02:00
unknown
1545e0e034 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/handler.cc:
  Using local
 2006-10-25 13:13:32 +02:00
unknown
c9b29c6c64 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
 2006-10-25 20:51:18 +10:00
unknown
564d03c01a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-10-25 12:43:16 +02:00
unknown
f0d4e0bf5a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-10-25 12:41:42 +02:00
unknown
4a9f71aef4 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
 2006-10-25 12:41:34 +02:00
unknown
379809f40e Set flag opt_skip_ndbcluster_slave if no slaves are being used. 
Add comments
Deperlify
 2006-10-25 12:40:33 +02:00
unknown
e11871d8bb post merge fixes (from merging test fixes from bug 19914) 
mysql-test/r/ndb_multi.result:
  update result file with post-merge results
sql/ha_ndbcluster.cc:
  update usage of ndb_get_table_statistics for changes made for bug 19914
 2006-10-25 20:37:10 +10:00
unknown
a48d710100 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


sql/handler.cc:
  Auto merged
 2006-10-25 12:21:45 +02:00
unknown
2def22731c Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
 2006-10-25 11:45:47 +02:00
unknown
08ce5b3dbd Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings 2006-10-25 11:44:40 +02:00
unknown
83d5beec5d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-rename-bug
 2006-10-25 13:04:07 +04:00
unknown
e4bacda5b2 fix test failures in the runtime tree 
sql/log.cc:
  NULL table pointer during initilization
sql/sql_table.cc:
  don't lock the destination table with table lock, but use name lock instead
 2006-10-25 12:54:59 +04:00
unknown
e3563c4e22 Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp 
into  ymer.(none):/usr/local/mysql/mysql-4.1-ndb
 2006-10-25 10:46:00 +02:00