Commits · 196862dfd94a749ff703e212dc5b62d19dce451d · Kirill Smelkov / mariadb

02 Sep, 2005 21 commits

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 196862df

unknown authored Sep 02, 2005

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0


sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged

196862df

Rename: · dc922213

unknown authored Sep 02, 2005

- current_arena to stmt_arena: the thread may have more than one
'current' arenas: one for runtime data, and one for the parsed 
tree of a statement. Only one of them is active at any moment.
- set_item_arena -> set_query_arena, because Item_arena was renamed to 
Query_arena a while ago
- set_n_backup_item_arena -> set_n_backup_active_arena;
the active arena is the arena thd->mem_root and thd->free_list
are currently pointing at.
- restore_backup_item_arena -> restore_active_arena (with the same
rationale)
- change_arena_if_needed -> activate_stmt_arena_if_needed; this
method sets thd->stmt_arena active if it's not done yet.


sql/item.cc:
  Rename.
sql/item_cmpfunc.cc:
  Rename.
sql/item_func.cc:
  Rename.
sql/item_subselect.cc:
  Rename.
sql/item_subselect.h:
  Remove an unused forward declaration.
sql/item_sum.h:
  Remove an unused forward declaration.
sql/mysql_priv.h:
  Remove an unused forward declaration.
sql/sp.cc:
  Rename.
sql/sp_head.cc:
  Rename.
sql/sql_base.cc:
  Rename.
sql/sql_class.cc:
  Rename.
sql/sql_class.h:
  Rename.
sql/sql_lex.cc:
  Rename.
sql/sql_parse.cc:
  Rename.
sql/sql_prepare.cc:
  Rename.
sql/sql_select.cc:
  Rename.
sql/sql_show.cc:
  Rename.
sql/sql_union.cc:
  Rename.
sql/sql_view.cc:
  Rename.
sql/table.cc:
  Rename.

dc922213

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 29a37a30
unknown authored Sep 02, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0


sql/sql_parse.cc:
  Auto merged
```
29a37a30
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · aeb7fe83
unknown authored Sep 02, 2005
```
into  eel.(none):/home/jonas/src/mysql-5.0-push
```
aeb7fe83
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 81f89241
unknown authored Sep 02, 2005
```
into  eel.(none):/home/jonas/src/mysql-5.0-push
```
81f89241
Removed redundant case in Makefile.am · 8f0530d0
unknown authored Sep 02, 2005
```
Makefile.am:
  Removed redundant case
```
8f0530d0
Merge eel.(none):/home/jonas/src/mysql-5.0 · 6f85ba17
unknown authored Sep 02, 2005
```
into  eel.(none):/home/jonas/src/mysql-5.0-push
```
6f85ba17

Merge eel.(none):/home/jonas/src/mysql-4.1 · 8c1b55ef

unknown authored Sep 02, 2005

into  eel.(none):/home/jonas/src/mysql-5.0


ndb/include/kernel/signaldata/SignalData.hpp:
  Auto merged
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  merge

8c1b55ef

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 3b08dec4
unknown authored Sep 02, 2005
```
into  mysql.com:/users/lthalmann/bk/mysql-5.0
```
3b08dec4

ndb - fix printout related to bug#10987 · f9d29cfe

unknown authored Sep 02, 2005


ndb/src/common/debugger/EventLogger.cpp:
  Fix extended printout of LCP_FRAGMENT_COMPLETED

f9d29cfe

ndb - bug#12608 · 21ce9ede

unknown authored Sep 02, 2005

  Always abort if node failure occured between startTransaction and commit
  (can later be improved by wl#2610)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Always abort if node failure occured between startTransaction and commit

21ce9ede

ndb - bug #10987 · 7056f0b3

unknown authored Sep 02, 2005

  make sure not to cut log to early 
  (specificly not use LCP with maxGciStarted that has not yet completed)


ndb/include/kernel/signaldata/SignalData.hpp:
  Add signal data printer for START_FRAG_REQ
ndb/include/kernel/signaldata/StartFragReq.hpp:
  Add signal data printer for START_FRAG_REQ
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Add signal data printer for START_FRAG_REQ
ndb/src/common/debugger/signaldata/StartRec.cpp:
  Add signal data printer for START_FRAG_REQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add maxGciStarted/Completed to event report
  bug: dont use LCP for calcKeepGci in maxGciSTarted is not completed

7056f0b3

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 28ed7dd9

unknown authored Sep 02, 2005

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


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

28ed7dd9

mysqltest.test: Remove output from shells in result file · 7f98b2a0

unknown authored Sep 02, 2005


mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/mysqltest.test:
  Send output from failed command to /dev/null in order to avoid recording the output from different shells

7f98b2a0

Merge mysql.com:/users/lthalmann/bk/mysql-4.1 · a03acb3c

unknown authored Sep 02, 2005

into  mysql.com:/users/lthalmann/bk/mysql-5.0


mysql-test/t/rpl_replicate_do.test:
  Auto merged
scripts/Makefile.am:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/r/rpl_replicate_do.result:
  Manual merge
sql/log_event.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge

a03acb3c

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 3e9a575a
unknown authored Sep 02, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
```
3e9a575a
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 92367e8b
unknown authored Sep 02, 2005
```
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0


sql/sql_parse.cc:
  Auto merged
```
92367e8b

postmerge changes · 7e2024b4

unknown authored Sep 02, 2005


mysql-test/t/lowercase_view.test:
  error code changed after merege
mysql-test/t/view.test:
  error code changed after merege
sql/item.cc:
  inline function used instead of frequently used expression
  removed old TODO
sql/sql_base.cc:
  layoutfixed
  inline function used instead of frequently used expression
sql/sql_insert.cc:
  inline function used instead of frequently used expression

7e2024b4

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

unknown authored Sep 02, 2005

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


mysql-test/t/rpl_slave_status.test:
  Merge to 5.0

b287e9e5

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 38b8687d
unknown authored Sep 02, 2005
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
38b8687d

sp_head.cc: · 59272376

unknown authored Sep 02, 2005

  Fix crash reported in bug 12849.
  It doesn't fix the whole problem though.
  Let Pem fix it later.


sql/sp_head.cc:
  Fix crash reported in bug 12849.
  It doesn't fix the whole problem though.
  Let Pem fix it later.

59272376

01 Sep, 2005 19 commits

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · ee436f7c
unknown authored Sep 02, 2005
```
into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542


sql/sql_parse.cc:
  Auto merged
```
ee436f7c

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 38b7c29a

unknown authored Sep 02, 2005

into  mysql.com:/home/dlenev/src/mysql-5.0-merges


mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged

38b7c29a

Fixes after merging fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES · 7dff8f20
unknown authored Sep 02, 2005
```
and GRANT in multi-threaded environment" into 5.0 tree.


sql/sql_acl.cc:
  After merge fixes.
```
7dff8f20
Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M50/merge-5.0 · 1a7bb6f5
unknown authored Sep 01, 2005
```
scripts/Makefile.am:
  Auto merged
```
1a7bb6f5
Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 · a29b21a2
unknown authored Sep 01, 2005

a29b21a2

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · a8fc85cb

unknown authored Sep 01, 2005

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0


BitKeeper/etc/config:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged

a8fc85cb

Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1 · b5131036
unknown authored Sep 01, 2005
```
scripts/Makefile.am:
  Auto merged
```
b5131036

Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423 · 7783dbbc

unknown authored Sep 01, 2005

into  mysql.com:/home/dlenev/src/mysql-5.0-merges


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/grant2.result:
  Manual merge.
mysql-test/t/grant2.test:
  Manual merge.
sql/sql_acl.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.

7783dbbc

Manual merge. · 9d996ad6

unknown authored Sep 01, 2005

Makefile.am:
Manual merge: For "test", use Kent's new version using the Perl script with port variables,
but also have the "test-force" target (used in the RPM spec!) (still using Shell).

9d996ad6

Fix missing command terminator · cc75310b

unknown authored Sep 01, 2005


mysql-test/t/rpl_slave_status.test:
  Missing command terminator for source command.

cc75310b

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3223cd93
unknown authored Sep 01, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
3223cd93

Fix for spelling miss and eol junk · a2d8ab0b

unknown authored Sep 01, 2005


client/mysqltest.c:
  Fix spelling error
mysql-test/t/information_schema.test:
  Eol junk detected, added #
mysql-test/t/rpl_slave_status.test:
  Missing ;
mysql-test/t/sp.test:
  Eol junk detected, added #
mysql-test/t/view.test:
  Eol junk detected, added #

a2d8ab0b

Add "MYSQL_BASE_VERSION" to the list of substituted variables in the "scripts" subdirectory. · dedb5b79

unknown authored Sep 01, 2005


scripts/Makefile.am:
  Add "MYSQL_BASE_VERSION" to the list of substituted variables,
  for later (possible) use in "mysql_install_db" and "mysqld_safe".

dedb5b79

Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 2f979b28
unknown authored Sep 01, 2005
```
into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
```
2f979b28

BUG#12542: Added comments · f8aadb60

unknown authored Sep 01, 2005


sql/log_event.cc:
  Added comments
sql/sql_parse.cc:
  Added comments

f8aadb60

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 1fba6e00

unknown authored Sep 01, 2005

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


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

1fba6e00

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 6ee54d73

unknown authored Sep 01, 2005

into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/t/mysqltest.test:
  Manual merge

6ee54d73

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 4fed1772

unknown authored Sep 01, 2005

into  neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/kill.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
client/mysqltest.c:
  Merge with --parsing-disabled
mysql-test/t/mysqltest.test:
  Manual merge

4fed1772

mysqltest improvements, updates after merge + test for 5.0 · e2965fb2

unknown authored Sep 01, 2005


client/mysqltest.c:
  Fixes after merge
mysql-test/r/type_newdecimal.result:
  Update results after correction of testcase
mysql-test/t/flush_read_lock_kill.test:
  Found extra delimiter
mysql-test/t/kill.test:
  Found extra delimiter
mysql-test/t/rpl_loaddata.test:
  Found extra delimiter
mysql-test/t/rpl_sp.test:
  Found extra delimiter
mysql-test/t/strict.test:
  Convert "!$1292" to "--error 1292"
mysql-test/t/type_newdecimal.test:
  Missing ;

e2965fb2