Commits · f1ad502ae1ebcac625a0213f9de1f178eb7a481e · Kirill Smelkov / mariadb

26 Nov, 2007 5 commits

Merge adventure.(none):/home/thek/Development/cpp/bug16470/my51-bug16470 · f1ad502a

unknown authored Nov 26, 2007

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  manual merge

f1ad502a

Bug#16470 crash on grant if old grant tables · 1ddb4722

unknown authored Nov 26, 2007

Loading 4.1 into 5.0 or 5.1 failed silently because procs_priv table missing.
This caused the server to crash on any attempt to store new grants because
of uninitialized structures.

This patch breaks up the grant loading function into two phases to allow
for procs_priv table to fail with an warning instead of crashing the server.


mysql-test/r/grant.result:
  Test case
mysql-test/t/grant.test:
  Test case making sure that FLUSH PRIVILEGES doesn't crash the server if
  procs_priv is removed.
sql/sql_acl.cc:
  - Refactored grant_reload into two phases: 1. open and lock tables_priv and 
    columns_priv tables, read the data, close tables. 2. open and lock
    procs_priv, read data, close table. Since the tables are independant of
    each other there will be no race conditions and it will be possible to
    handle situations where the procs_priv table isn't present.
  - Refactored the helper function grant_load into new grant_load (without
    procs_priv table) and grant_load_procs_priv.
sql/sql_parse.cc:
  - Changed comment style to doxygen style.

1ddb4722

Merge adventure.(none):/home/thek/Development/cpp/bug32436/my51-bug32436 · 1522ef3f
unknown authored Nov 26, 2007
```
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/item_func.cc:
  Auto merged
```
1522ef3f
Merge adventure.(none):/home/thek/Development/cpp/bug32436/my50-bug32436 · 0b65a2e7
unknown authored Nov 26, 2007
```
into  adventure.(none):/home/thek/Development/cpp/bug32436/my51-bug32436


sql/item_func.cc:
  Auto merged
```
0b65a2e7

Bug #32436 KILL QUERY completely deadlocks mysqld · fea1524d

unknown authored Nov 26, 2007

Sending several "KILL QUERY" statements to target a connection running
"SELECT SLEEP" could freeze the server.

The locking order in Item_func_sleep was wrong and this could lead to a
dead lock.

This patch solves the issue by resolving the locking order properly.


sql/item_func.cc:
  - Moved LOCK_user_locks critical region so that it doesn't share space with
    mysys_var->mutex region; this can lead to deadlock.

fea1524d

23 Nov, 2007 2 commits

Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · c01974f0

unknown authored Nov 23, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Manual merge.

c01974f0

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 85ff2b98
unknown authored Nov 23, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
85ff2b98

22 Nov, 2007 10 commits

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · a48b491b
unknown authored Nov 22, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
a48b491b
Merge darnaut@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · a84d90e6
unknown authored Nov 22, 2007
```
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
```
a84d90e6

Merge endora.local:/Users/davi/mysql/bugs/32528-5.0 · ed4edda1

unknown authored Nov 22, 2007

into  endora.local:/Users/davi/mysql/mysql-5.1-runtime


sql/sql_parse.cc:
  Auto merged
mysql-test/r/flush.result:
  SCCS merged
mysql-test/t/flush.test:
  SCCS merged

ed4edda1

Merge endora.local:/Users/davi/mysql/bugs/32528-5.0 · a8b4bc81
unknown authored Nov 22, 2007
```
into  endora.local:/Users/davi/mysql/mysql-5.0-runtime
```
a8b4bc81

Bug#32528 Global read lock with a low priority write lock causes a server crash · 719e64e4

unknown authored Nov 22, 2007

FLUSH TABLES WITH READ LOCK fails to properly detect write locked
tables when running under low priority updates.

The problem is that when trying to aspire a global read lock, the
reload_acl_and_cache() function fails to properly check if the thread
has a low priority write lock, which later my cause a server crash or
deadlock.

The solution is to simple check if the thread has any type of the
possible exclusive write locks.


mysql-test/r/flush.result:
  Add test case result for Bug#32528
mysql-test/t/flush.test:
  Add test case for Bug#32528
sql/sql_parse.cc:
  Although it should not matter under LOCK TABLES, use TL_WRITE_ALLOW_WRITE
  to emphasize that it should fail in case of any write lock.

719e64e4

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 9e1d7d7e

unknown authored Nov 22, 2007

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/skip_grants.result:
  Manual merge.
mysql-test/t/skip_grants.test:
  Manual merge.

9e1d7d7e

Add a test case for Bug#29817. The bug was fixed by the patch for · 6f9dfaa4

unknown authored Nov 22, 2007

Bug#28318.


mysql-test/r/skip_grants.result:
  Add a test case for Bug#29817
mysql-test/t/skip_grants.test:
  Add a test case for Bug#29817

6f9dfaa4

Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base · 01900080

unknown authored Nov 21, 2007

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

01900080

Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base · a11256f4

unknown authored Nov 21, 2007

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge


sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

a11256f4

Update the failing kill test in the team tree. · add444a4

unknown authored Nov 22, 2007


mysql-test/r/kill.result:
  Update the broken result (kill.test fails in the team tree).
mysql-test/t/kill.test:
  Fix the broken test (team tree)

add444a4

21 Nov, 2007 15 commits

Merge adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153 · 569c2dcd

unknown authored Nov 21, 2007

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime


sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

569c2dcd

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 787316f2
unknown authored Nov 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
787316f2
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 1fb0a096
unknown authored Nov 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
1fb0a096

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · a393b62e

unknown authored Nov 21, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


support-files/compiler_warnings.supp:
  merge fix

a393b62e

add wrong warning to suppression file · 98c55d39
unknown authored Nov 21, 2007
```
support-files/compiler_warnings.supp:
  we want that.
```
98c55d39

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 6d5ab945

unknown authored Nov 21, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


support-files/compiler_warnings.supp:
  merge fix

6d5ab945

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e8673939
unknown authored Nov 21, 2007
```
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
```
e8673939

ignore readline warnings · 75f14d9b

unknown authored Nov 21, 2007


support-files/compiler_warnings.supp:
  readline is not maintained by us

75f14d9b

Merge five.local.lan:/work/merge/mysql-5.0-build-30418 · 705d58f8

unknown authored Nov 21, 2007

into  five.local.lan:/work/merge/mysql-5.1-build-31610


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged

705d58f8

This changeset fixes · b6c38105

unknown authored Nov 21, 2007

   Bug#31567 "datadict" tests (all engines) fail:
             Reference protocol is non-standard build
   Bug#30418 "datadict" tests (all engines) fail:
             Dependency on the host name for ordering   
Modifications:
   1. The standard builds (build team) do not contain
      the collation 'utf8_general_cs'.
      The common developer builds (compuile-....-max)
      contain this collation.
      Solution fitting to both build variants:
         Exclude the collation 'utf8_general_cs' from
         result sets.
   2. Use mysqltest builtin sorting of result set for
      the statement where the hostname affects the
      row order.


mysql-test/suite/funcs_1/datadict/datadict_master.inc:
  Exclude collation 'utf8_general_cs' from result set.
mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
  Use mysqltest builtin sorting of result set.
mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
  Exclude collation 'utf8_general_cs' from result set.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated  results
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated  results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated  results

b6c38105

Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153 · bc54a373

unknown authored Nov 21, 2007

into  adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153


sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Null merge.
sql/sql_base.cc:
  Manual merge
sql/sql_lex.h:
  Manual merge

bc54a373

Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153 · 1ae0237f

unknown authored Nov 21, 2007

into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime


sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Manual merge.

1ae0237f

Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b25146/51 · df20252c
unknown authored Nov 20, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


client/mysql.cc:
  Auto merged
```
df20252c
Merge endora.local:/Users/davi/mysql/mysql-5.0-runtime · dd98703b
unknown authored Nov 20, 2007
```
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
```
dd98703b

Bug #25146: Some warnings/errors not shown when using --show-warnings · 49b527ab

unknown authored Nov 20, 2007

In several cases, an error when processing the query would cause mysql to
return to the top level without printing warnings.  Fix is to always
print any available warnings before returning to the top level.


client/mysql.cc:
  In com_go(), ensure that warnings are printed even if an error
  occurred when processing the query.  Before this patch, an error
  in several places would return to the top level without printing
  associated warnings.
  
  Attempt to avoid printing the warning, though, if it's a duplicate
  of mysql_error() for the connection handle.
mysql-test/r/mysql.result:
  Add test for bug 25146
mysql-test/t/mysql.test:
  Add test for bug 25146

49b527ab

20 Nov, 2007 8 commits

Merge endora.local:/Users/davi/mysql/bugs/17244-5.1 · ea9c593a
unknown authored Nov 20, 2007
```
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
```
ea9c593a
Minor update to allowed errors list in mysql-test's mtr_report.pl · 693447f2
unknown authored Nov 20, 2007
```
mysql-test/lib/mtr_report.pl:
  Update 'allowed errors' list to match re-formatted InnoDB error message.
```
693447f2
This issue was fixed in Bug 30904 which includes a similar test case. · aac6f106
unknown authored Nov 20, 2007
```
mysql-test/t/sp_notembedded.test:
  Remove test case, it's not needed any more.
```
aac6f106

Applied InnoDB snapshot innodb-5.1-ss2093 · fcd89fcc

unknown authored Nov 20, 2007

Fixes the following bug:

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.


storage/innobase/dict/dict0dict.c:
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Revision r2092:
  Remove the unused function innobase_convert_from_filename() that was
  inadvertently added in r590.
storage/innobase/handler/ha_innodb.cc:
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Revision r2088:
  Fix Bug#32125 (http://bugs.mysql.com/32125)
  "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
  
  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
  
  Approved by:	Heikki (via IM)
  
  
  
  Revision r2093:
  convert_search_mode_to_innobase(): Add the missing case label
  HA_READ_MBR_EQUAL that was forgotten in r2088.
  
  
  Revision r2089:
  Non-functional change: convert the switch in convert_search_mode_to_innobase()
  to the InnoDB coding style.
  
  
  Revision r2092:
  Remove the unused function innobase_convert_from_filename() that was
  inadvertently added in r590.
storage/innobase/include/page0cur.h:
  Applied InnoDB snapshot innodb-5.1-ss2093
  
  Revision r2088:
  Fix Bug#32125 (http://bugs.mysql.com/32125)
  "Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":
  
  When unknown find_flag is encountered in convert_search_mode_to_innobase()
  do not call assert(0); instead queue a MySQL error using my_error() and
  return the error code PAGE_CUR_UNSUPP. Change the functions that call
  convert_search_mode_to_innobase() to handle that error code by "canceling"
  execution and returning appropriate error code further upstream.
  
  Approved by:	Heikki (via IM)

fcd89fcc

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · ec85f186
unknown authored Nov 20, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51
```
ec85f186

Merge ramayana.hindu.god:/home/tsmith/m/inno/nov19/50 · fb0371d7

unknown authored Nov 20, 2007

into  ramayana.hindu.god:/home/tsmith/m/inno/nov19/51


storage/innobase/handler/ha_innodb.cc:
  Use local (null merge)
storage/innobase/include/db0err.h:
  Use local (null merge)
storage/innobase/include/os0sync.h:
  Use local (null merge)
storage/innobase/include/page0cur.h:
  Use local (null merge)
storage/innobase/include/sync0rw.h:
  Use local (null merge)
storage/innobase/include/sync0rw.ic:
  Use local (null merge)
storage/innobase/include/sync0sync.ic:
  Use local (null merge)
storage/innobase/os/os0sync.c:
  Use local (null merge)
storage/innobase/srv/srv0srv.c:
  Use local (null merge)
storage/innobase/sync/sync0arr.c:
  Use local (null merge)
storage/innobase/sync/sync0rw.c:
  Use local (null merge)
storage/innobase/sync/sync0sync.c:
  Use local (null merge)

fb0371d7

Applied InnoDB snapshot innodb-5.0-ss2095 · a3dc40e2

unknown authored Nov 20, 2007

Fixes the following bugs:

- Bug #29560: InnoDB >= 5.0.30 hangs on adaptive hash rw-lock 'waiting for an X-lock'

Fixed a race condition in the rw_lock where an os_event_reset()
can overwrite an earlier os_event_set() triggering an indefinite
wait.
NOTE: This fix for windows is different from that for other platforms.
NOTE2: This bug is introduced in the scalability fix to the
sync0arr which was applied to 5.0 only. Therefore, it need not be
applied to the 5.1 tree. If we decide to port the scalability fix
to 5.1 then this fix should be ported as well.

- Bug #32125: Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase

When unknown find_flag is encountered in convert_search_mode_to_innobase()
do not call assert(0); instead queue a MySQL error using my_error() and
return the error code PAGE_CUR_UNSUPP. Change the functions that call
convert_search_mode_to_innobase() to handle that error code by "canceling"
execution and returning appropriate error code further upstream.

innobase/include/db0err.h:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2091:
branches/5.0:

Merge r2088 from trunk:

log for r2088:

Fix Bug#32125 (http://bugs.mysql.com/32125)
"Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":

Approved by: Heikki
innobase/include/os0sync.h:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/include/page0cur.h:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2091:
branches/5.0:

Merge r2088 from trunk:

log for r2088:

Fix Bug#32125 (http://bugs.mysql.com/32125)
"Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":

Approved by: Heikki
innobase/include/sync0rw.h:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/include/sync0rw.ic:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/include/sync0sync.ic:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/os/os0sync.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/srv/srv0srv.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/sync/sync0arr.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/sync/sync0rw.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
innobase/sync/sync0sync.c:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2082:
branches/5.0: bug#29560

Reviewed by: Heikki
sql/ha_innodb.cc:
Applied InnoDB snapshot innodb-5.0-ss2095

Revision r2091:
branches/5.0:

Merge r2088 from trunk:

log for r2088:

Fix Bug#32125 (http://bugs.mysql.com/32125)
"Database crash due to ha_innodb.cc:3896: ulint convert_search_mode_to_innobase":

Approved by: Heikki

Revision r2095:
branches/5.0: Merge r2093 from trunk:

convert_search_mode_to_innobase(): Add the missing case label
HA_READ_MBR_EQUAL that was forgotten in r2088.

a3dc40e2

Merge endora.local:/Users/davi/mysql/bugs/31397-5.1 · 7cf04ced
unknown authored Nov 20, 2007
```
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime


sql/sql_class.cc:
  Auto merged
```
7cf04ced