Commits · eef7dff35176205b2e8f600918146c56bd9696fc · nexedi / MariaDB

02 Sep, 2005 21 commits

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

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

eef7dff3

Rename: · 8857d641

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.

8857d641

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


sql/sql_parse.cc:
  Auto merged
```
8027ca8f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · ba5d5bbf
unknown authored Sep 02, 2005
```
into  eel.(none):/home/jonas/src/mysql-5.0-push
```
ba5d5bbf
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0923d5bd
unknown authored Sep 02, 2005
```
into  eel.(none):/home/jonas/src/mysql-5.0-push
```
0923d5bd
Removed redundant case in Makefile.am · 331f75d1
unknown authored Sep 02, 2005
```
Makefile.am:
  Removed redundant case
```
331f75d1
Merge eel.(none):/home/jonas/src/mysql-5.0 · 2c353660
unknown authored Sep 02, 2005
```
into  eel.(none):/home/jonas/src/mysql-5.0-push
```
2c353660

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

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

e5733f2a

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

ndb - fix printout related to bug#10987 · dfa2174a

unknown authored Sep 02, 2005


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

dfa2174a

ndb - bug#12608 · a4337300

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

a4337300

ndb - bug #10987 · d67ce2a9

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

d67ce2a9

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

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

dc243124

mysqltest.test: Remove output from shells in result file · 1da95439

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

1da95439

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

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

78a67d55

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


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

postmerge changes · 5985c127

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

5985c127

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

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

f1f3cedd

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

sp_head.cc: · d8574776

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.

d8574776

01 Sep, 2005 19 commits

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


sql/sql_parse.cc:
  Auto merged
```
02e88319

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 43d488bc

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

43d488bc

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


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

f11b8910

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

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

1eec03a3

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

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

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.

d0bd6be9

Manual merge. · 129c7ab7

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).

129c7ab7

Fix missing command terminator · 887f24b1

unknown authored Sep 01, 2005


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

887f24b1

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

Fix for spelling miss and eol junk · 840e3735

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 #

840e3735

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

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".

96e473e4

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

BUG#12542: Added comments · 9eb2af5d

unknown authored Sep 01, 2005


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

9eb2af5d

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

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

dd7c6d12

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

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

3331e074

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

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

c3f48766

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

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 ;

99725232