Commits · 5af294b9aa250f393fea101ba3534b27ab8b9dd7 · Kirill Smelkov / mariadb

22 Nov, 2006 2 commits

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635 · 5af294b9

unknown authored Nov 22, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635


sql/item_sum.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge.

5af294b9

BUG#21635: MYSQL_FIELD struct's member strings seem to misbehave for · 18770d2f

unknown authored Nov 22, 2006

expression cols.

The problem was that MYSQL_FIELD::org_name was set for MIN() and MAX()
functions (COUNT() is also mentioned in the bug report but was already
fixed).

After this patch for expressions MYSQL_FIELD::name is set to either
expression itself or its alias, and other data origin fields of
MYSQL_FILED (db, org_table, table, org_name) are empty strings.


sql/item_sum.cc:
  For expressions only col_name should be non-empty string.
tests/mysql_client_test.c:
  Add test case for bug#21635: MYSQL_FIELD struct's member strings seem
  to misbehave for expression cols.

18770d2f

13 Nov, 2006 2 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 1031c460
unknown authored Nov 13, 2006
```
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651


sql/item_func.cc:
  Auto merged
```
1031c460

Fix for bug bug#23651 "Server crashes when trigger which uses · fc83f787

unknown authored Nov 13, 2006

stored function invoked from different connections".

Invocation of trigger which was using stored function from different
connections caused server crashes (for non-debug server this happened
in highly concurrent environment, but debug server failed on assertion
in relatively simple scenario).

Item_func_sp was not safe to use in triggers (in other words for
re-execution from different threads) as artificial TABLE object
pointed by Item_func_sp::dummy_table referenced incorrect THD
object. To fix the problem we force re-initialization of this
object for each re-execution of statement.


mysql-test/r/trigger.result:
  Added test for bug#23651 "Server crashes when trigger which uses
  stored function invoked from different connections".
mysql-test/t/trigger.test:
  Added test for bug#23651 "Server crashes when trigger which uses
  stored function invoked from different connections".
sql/item_func.cc:
  To make Item_func_sp safe for usage in triggers (in other words safe
  for re-execution in different threads) we need to ensure that artificial
  TABLE object pointed by Item_func_sp::dummy_table references correct
  THD object. To achieve this we simply force its re-initialization for
  each re-execution of statement.

fc83f787

12 Nov, 2006 1 commit
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 383fbde5
  unknown authored Nov 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  383fbde5
11 Nov, 2006 3 commits

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 3af223ed
unknown authored Nov 11, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
3af223ed

mysql-test-run.pl: · c6d31783

unknown authored Nov 11, 2006

  Test for base directory when a RPM install corrected


mysql-test/mysql-test-run.pl:
  Test for base directory when a RPM install corrected

c6d31783

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 75a0878f

unknown authored Nov 11, 2006

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/t/rename.test:
  Use local (resolve a conflict)

75a0878f

10 Nov, 2006 15 commits

Merge trift2.:/M50/mysql-5.0 · 2220a3a8
unknown authored Nov 10, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
2220a3a8
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 40896957
unknown authored Nov 10, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
40896957

Merge trift2.:/MySQL/M50/bug24023-5.0 · f4113236

unknown authored Nov 10, 2006

into  trift2.:/MySQL/M50/push-5.0


BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged

f4113236

Merge trift2.:/MySQL/M41/push-4.1 · 56934f9d

unknown authored Nov 10, 2006

into  trift2.:/MySQL/M50/push-5.0


BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
myisam/sort.c:
  Manual merge: "use local" (= 5.0 version).
mysql-test/mysql-test-run.pl:
  Manual merge, part of the fix for bug#17194.

56934f9d

Merge trift2.:/MySQL/M41/bug17194-4.1 · aa341c49
unknown authored Nov 10, 2006
```
into  trift2.:/MySQL/M41/push-4.1
```
aa341c49

Merge trift2.:/MySQL/M41/clone-4.1 · 744aadbe

unknown authored Nov 10, 2006

into  trift2.:/MySQL/M41/push-4.1


myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.

744aadbe

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1cb38d3b
unknown authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
```
1cb38d3b
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 694227c0
unknown authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/mysql-test-run.pl:
  merge
```
694227c0

Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · 0f8e62b4

unknown authored Nov 10, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/mysql-test-run.pl:
  Auto merged

0f8e62b4

add --report-features to mysql-test-run.pl · df1b6ae6

unknown authored Nov 10, 2006


mysql-test/mysql-test-run.pl:
  add --report-features
mysql-test/include/report-features.test:
  test file showing server features for mysql-test-run.pl --report-features

df1b6ae6

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 · cb80733a

unknown authored Nov 10, 2006

into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/t/rename.test:
  choose one of the race problem solutions. It was solved
  differently in -runtime and mainstream

cb80733a

Memory allocation bug fixed · 3c47f57f
unknown authored Nov 10, 2006

3c47f57f
Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic · 71c646f3
unknown authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
71c646f3

Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic · bb662f6e

unknown authored Nov 10, 2006

into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic


mysql-test/mysql-test-run.sh:
  Auto merged

bb662f6e

mysql-test-run.sh: · facaaeb4

unknown authored Nov 10, 2006

  Added --force-restart pseudo server argument to shell version as well


mysql-test/mysql-test-run.sh:
  Added --force-restart pseudo server argument to shell version as well

facaaeb4

09 Nov, 2006 4 commits

mysql-test/install_test_db.sh · 62e0e608

unknown authored Nov 09, 2006

    Adapt to the different path of the server program, if installation was by RPM.
    Missing in the first changeset for bug#17194.


mysql-test/install_test_db.sh:
  Adapt to the different path of the server program, if installation was by RPM.
  Missing in the first changeset for bug#17194.

62e0e608

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41 · 44f15cae
unknown authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50


innobase/fil/fil0fil.c:
  use local
```
44f15cae

This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33 · 870b2e0a

unknown authored Nov 09, 2006

Fixes:
- Bug #24089: Race condition in fil_flush_file_spaces()


innobase/fil/fil0fil.c:
  Applied innodb-4.1-ss33
  
  Revision r33:
  innodb-4.1: Merge r1002 from innodb/trunk:
  
  fil_flush_file_spaces(): Copy the system->unflushed_spaces list to an
  array while holding the mutex.  This removes the crash-triggering
  race condition that was introduced when fixing Bug 15653.  (Bug #24089)

870b2e0a

This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 · c12c382f

unknown authored Nov 09, 2006

Fixes:
- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #23769: Debug assertion failure with innodb_locks_unsafe_for_binlog
- Bug #24089: Race condition in fil_flush_file_spaces()

innobase/buf/buf0buf.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1000:
branches/5.0: Merge r999 from trunk:

Reduce buffer pool mutex contention under >= 4 big concurrent
CPU-bound SELECT queries. (Bug #22868)

Fix: replace the mutex by one mutex protecting the 'flush list'
(and the free list) and several mutexes protecting portions of the
buffer pool, where we keep several indivudual LRU lists of pages.

This patch is from Sunny Bains and Heikki Tuuri.
innobase/buf/buf0flu.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1000:
branches/5.0: Merge r999 from trunk:

Reduce buffer pool mutex contention under >= 4 big concurrent
CPU-bound SELECT queries. (Bug #22868)

Fix: replace the mutex by one mutex protecting the 'flush list'
(and the free list) and several mutexes protecting portions of the
buffer pool, where we keep several indivudual LRU lists of pages.

This patch is from Sunny Bains and Heikki Tuuri.
innobase/buf/buf0lru.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1000:
branches/5.0: Merge r999 from trunk:

Reduce buffer pool mutex contention under >= 4 big concurrent
CPU-bound SELECT queries. (Bug #22868)

Fix: replace the mutex by one mutex protecting the 'flush list'
(and the free list) and several mutexes protecting portions of the
buffer pool, where we keep several indivudual LRU lists of pages.

This patch is from Sunny Bains and Heikki Tuuri.
innobase/dict/dict0crea.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r974:
branches/5.0: Port r973 from trunk.

Do not break the latching order in TRUNCATE TABLE.

dict_truncate_index_tree(): Replace parameter rec_t* rec with
btr_pcur_t* pcur. Reposition pcur before calling btr_create().

sync_thread_add_level(): Remove the relaxation of the assertion added in r968.
innobase/fil/fil0fil.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1003:
branches/5.0: Merge r1002 from trunk:

fil_flush_file_spaces(): Copy the system->unflushed_spaces list to an
array while holding the mutex. This removes the crash-triggering
race condition that was introduced when fixing Bug 15653. (Bug #24089)
innobase/include/buf0buf.h:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1000:
branches/5.0: Merge r999 from trunk:

Reduce buffer pool mutex contention under >= 4 big concurrent
CPU-bound SELECT queries. (Bug #22868)

Fix: replace the mutex by one mutex protecting the 'flush list'
(and the free list) and several mutexes protecting portions of the
buffer pool, where we keep several indivudual LRU lists of pages.

This patch is from Sunny Bains and Heikki Tuuri.
innobase/include/buf0buf.ic:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1000:
branches/5.0: Merge r999 from trunk:

Reduce buffer pool mutex contention under >= 4 big concurrent
CPU-bound SELECT queries. (Bug #22868)

Fix: replace the mutex by one mutex protecting the 'flush list'
(and the free list) and several mutexes protecting portions of the
buffer pool, where we keep several indivudual LRU lists of pages.

This patch is from Sunny Bains and Heikki Tuuri.
innobase/include/dict0crea.h:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r974:
branches/5.0: Port r973 from trunk.

Do not break the latching order in TRUNCATE TABLE.

dict_truncate_index_tree(): Replace parameter rec_t* rec with
btr_pcur_t* pcur. Reposition pcur before calling btr_create().

sync_thread_add_level(): Remove the relaxation of the assertion added in r968.
innobase/include/sync0arr.h:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1001:
branches/5.0: Reduce locking contention:

Bug #15815: 'Thread thrashing' with > 50 concurrent connections under
an update-intensive workload.
Fix: Introduce one event per InnoDB semaphore.

This patch is from Sunny Bains and Heikki Tuuri.
This patch will not be merged to trunk (MySQL/InnoDB 5.1) yet,
because it tries to address the problem in a different way.
innobase/include/sync0rw.h:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1001:
branches/5.0: Reduce locking contention:

Bug #15815: 'Thread thrashing' with > 50 concurrent connections under
an update-intensive workload.
Fix: Introduce one event per InnoDB semaphore.

Revision r1001:
branches/5.0: Reduce locking contention:

Bug #15815: 'Thread thrashing' with > 50 concurrent connections under
an update-intensive workload.
Fix: Introduce one event per InnoDB semaphore.

Revision r1001:
branches/5.0: Reduce locking contention:

Bug #15815: 'Thread thrashing' with > 50 concurrent connections under
an update-intensive workload.
Fix: Introduce one event per InnoDB semaphore.

This patch is from Sunny Bains and Heikki Tuuri.
This patch will not be merged to trunk (MySQL/InnoDB 5.1) yet,
because it tries to address the problem in a different way.
innobase/os/os0sync.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1001:
branches/5.0: Reduce locking contention:

Bug #15815: 'Thread thrashing' with > 50 concurrent connections under
an update-intensive workload.
Fix: Introduce one event per InnoDB semaphore.

This patch is from Sunny Bains and Heikki Tuuri.
This patch will not be merged to trunk (MySQL/InnoDB 5.1) yet,
because it tries to address the problem in a different way.
innobase/row/row0mysql.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r974:
branches/5.0: Port r973 from trunk.

Do not break the latching order in TRUNCATE TABLE.

dict_truncate_index_tree(): Replace parameter rec_t* rec with
btr_pcur_t* pcur. Reposition pcur before calling btr_create().

sync_thread_add_level(): Remove the relaxation of the assertion added in r968.
innobase/row/row0sel.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r982:
branches/5.0: row_sel(): Do not try to acquire a LOCK_REC_NOT_GAP lock
on the supremum record. Instead, skip to the next record. (Bug #23769)
This fix was backported from r623 in the 5.1 tree.
innobase/srv/srv0start.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r926:
Refer to bug: 22268. Since no one tries to run 5.0 on Windows 95/ME it was
decided to raise the limit of srv_max_n_threads to 10000 on Windows.
innobase/sync/sync0arr.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1001:
branches/5.0: Reduce locking contention:

Bug #15815: 'Thread thrashing' with > 50 concurrent connections under
an update-intensive workload.
Fix: Introduce one event per InnoDB semaphore.

This patch is from Sunny Bains and Heikki Tuuri.
This patch will not be merged to trunk (MySQL/InnoDB 5.1) yet,
because it tries to address the problem in a different way.
innobase/sync/sync0rw.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r1001:
branches/5.0: Reduce locking contention:

Bug #15815: 'Thread thrashing' with > 50 concurrent connections under
an update-intensive workload.
Fix: Introduce one event per InnoDB semaphore.

This patch is from Sunny Bains and Heikki Tuuri.
This patch will not be merged to trunk (MySQL/InnoDB 5.1) yet,
because it tries to address the problem in a different way.
innobase/sync/sync0sync.c:
Applied innodb-5.0-ss982, -ss998, -ss1003

Revision r969:
branches/5.0: Port r968 from trunk:

sync_thread_add_level(): When level == SYNC_TREE_NODE, allow the latching
order to be violated if the thread holds dict_operation_lock, whose level is
SYNC_DICT_OPERATION. This removes the assertion failure of TRUNCATE TABLE
#ifdef UNIV_SYNC_DEBUG.

Revision r974:
branches/5.0: Port r973 from trunk.

Do not break the latching order in TRUNCATE TABLE.

dict_truncate_index_tree(): Replace parameter rec_t* rec with
btr_pcur_t* pcur. Reposition pcur before calling btr_create().

sync_thread_add_level(): Remove the relaxation of the assertion added in r968.

Revision r1001:
branches/5.0: Reduce locking contention:

Bug #15815: 'Thread thrashing' with > 50 concurrent connections under
an update-intensive workload.
Fix: Introduce one event per InnoDB semaphore.

This patch is from Sunny Bains and Heikki Tuuri.
This patch will not be merged to trunk (MySQL/InnoDB 5.1) yet,
because it tries to address the problem in a different way.

c12c382f

08 Nov, 2006 13 commits

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 · 8bad3511
unknown authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
8bad3511
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41 · 671d863c
unknown authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
```
671d863c
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50 · 60042317
unknown authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
60042317

Fix warnings and NetWare compile failure · 0100c53f

unknown authored Nov 09, 2006


client/mysql_upgrade.c:
  Fix NetWare problem - illegal cast of "const char*" to "char*"
  Fix warning, init "mystat" in  FILEINFO to NULL
  Fix warning, remove unused variable "i"

0100c53f

Merge bk-internal:/home/bk/mysql-5.0-maint · b3e24bed
unknown authored Nov 08, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
b3e24bed

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · b1520eb3

unknown authored Nov 08, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged

b1520eb3

Update of --mem flag after comments · d3b049a6

unknown authored Nov 08, 2006


mysql-test/mysql-test-run.pl:
  Allow --mem to be specified as a flag or --mem=<dir>
  Add /tmp to locations to search
  Update comments and usage description

d3b049a6

No need to pass an additional arg to to mtr_add_arg when there is no % sign · 26e6d788
unknown authored Nov 08, 2006

26e6d788

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 39c8672f

unknown authored Nov 08, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

39c8672f

Pass location of charsets dir to mysqltest to avoid using the charsetdir... · 427f1aca

unknown authored Nov 08, 2006

Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 


client/mysqltest.c:
  Add new option --character-sets-dir to mysqltest
  Set MYSQL_SET_CHRSET_DIR before connecting to mysqld if the above variable is set
mysql-test/mysql-test-run.pl:
  Pass $path_charsetsdir to mysqltest

427f1aca

Don't run mysqltest with both --silent and --verbose · c98a6dc8
unknown authored Nov 08, 2006

c98a6dc8

Merge trift2.:/MySQL/M41/bug24023-4.1 · eccb8ef7

unknown authored Nov 08, 2006

into  trift2.:/MySQL/M50/bug24023-5.0


BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged

eccb8ef7

Merge trift2.:/MySQL/M41/bug24023-4.1 · a033047b
unknown authored Nov 08, 2006
```
into  trift2.:/MySQL/M41/clone-4.1
```
a033047b