Commits · 56d0690f2bfb42278f04a1e86feeaa7dba3b391b · nexedi / MariaDB

02 Nov, 2007 1 commit

Fix several merge problems. There are many changes in 5.1 from 5.0 · 56d0690f

unknown authored Nov 02, 2007

that affect profiling.


mysql-test/r/information_schema.result:
  Merge fixed.  This result moved to a new file.
sql/sql_parse.cc:
  Include profiling in statistics.
  
  Add hook for SHOW_PROFILE in execution.
sql/sql_profile.cc:
  Move/add the FEATURE_DISABLED warning to the I_S filling func.
  
  Fix merge, where a new member was added to ST_FIELD_INFO.
  
  orig_sql_command method was removed from Lex structure.
sql/sql_show.cc:
  Fix merge problem.
sql/sql_yacc.yy:
  orig_sql_command member removed from Lex structure in 5.1 .

56d0690f

31 Oct, 2007 3 commits

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community · c4991562

unknown authored Oct 31, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1


CMakeLists.txt:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
client/CMakeLists.txt:
  Auto merged
extra/CMakeLists.txt:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
server-tools/instance-manager/CMakeLists.txt:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/myisam/CMakeLists.txt:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Manual merge.
configure.in:
  Manual merge.
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/t/profiling.test:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_profile.cc:
  Manual merge.
sql/sql_profile.h:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/table.h:
  Manual merge.
storage/ndb/src/common/util/File.cpp:
  Manual merge.
support-files/mysql.spec.sh:
  Manual merge.

c4991562

Sundry changes to fix merge problems. Most of these are duplicated · db2f84af

unknown authored Oct 31, 2007

in 5.0-community, but pulling to merge was very hard.


sql/mysql_priv.h:
  Add new extern "C" qualification to set_thd_proc_info().
  
  Fix typo in merge.
sql/mysqld.cc:
  Replace obselete gptr with uchar* .
  
  Add missing #endif from merge problem.
sql/set_var.cc:
  Include new parameter to user variable contruction.
sql/sql_cache.cc:
  Remove duplicate line from merge problem.
sql/sql_profile.cc:
  struct st_table_list is now typedef'd to a new name.
  
  ST_FIELD_INFO now includes a new member, a pointer to an open_table
  function.
sql/sql_profile.h:
  struct st_table_list is now typedef'd to a new name.

db2f84af

Push history-limiting code until after the code that adds new · d1bf21df
unknown authored Oct 31, 2007
```
history entries.  Lazy deletion isn't smart or useful here.
```
d1bf21df

29 Oct, 2007 3 commits

Remove easily-changed and prominent variable that toggled · 46f19945

unknown authored Oct 29, 2007

community-server features.

Community server features should be fully integrated into 5.1, but
disabled by default.  We never toggle that they're disabled based
on the version number, in the 5.1 line and later.


configure.in:
  Remove easily-changed and prominent variable that toggled
  community-server features.

46f19945

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge · e78a21ee

unknown authored Oct 29, 2007

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1


client/mysqlcheck.c:
  Auto merged
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
sql/sql_lex.h:
  SCCS merged

e78a21ee

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2a934d94
unknown authored Oct 29, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
2a934d94

25 Oct, 2007 1 commit

Mimic a rename which Daniel already did in 6.0, · 3e6acc9a

unknown authored Oct 25, 2007

to get rid of a name clash among *deleted* files on case-insignificant file systems.

BitKeeper/deleted/.del-changelog-bleh:
Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh

3e6acc9a

24 Oct, 2007 1 commit
- result fix · 611a8972
  unknown authored Oct 24, 2007
  
  611a8972
23 Oct, 2007 31 commits

result fix · a3d3fa35
unknown authored Oct 23, 2007

a3d3fa35

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 2446b969

unknown authored Oct 23, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  after merge fix

2446b969

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · cb178356
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
cb178356
after merge fix · e3eed377
unknown authored Oct 23, 2007

e3eed377

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · a895c8f0

unknown authored Oct 23, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/client_priv.h:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/query_cache.result:
  manual merge
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/query_cache.test:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

a895c8f0

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 3e459feb

unknown authored Oct 23, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

3e459feb

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 63230037
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
63230037
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 4eaaddec
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
4eaaddec
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 4cc7db9d
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
4cc7db9d

Merge mysql.com:/home/hf/work/30638/my50-30638 · a540bfee

unknown authored Oct 23, 2007

into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged

a540bfee

Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 1cdb1777
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
1cdb1777
Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · 1d3ab6fe
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
1d3ab6fe
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2e2f6ea7
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
2e2f6ea7
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 00637970
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
00637970
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · cc7c8e93
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550


sql/filesort.cc:
  SCCS merged
```
cc7c8e93
type conversions fixed to get rid of warnings · d61d1880
unknown authored Oct 23, 2007
```
sql/ha_heap.cc:
  type conversion fix
sql/opt_range.cc:
  type conversion fix
```
d61d1880
Merge mysql.com:/home/hf/work/30638/my50-30638 · a4c0c6f4
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
a4c0c6f4
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · a8cd7af9
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
a8cd7af9
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 5c7c4141
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
```
5c7c4141
merge 5.0-opt -> 5.1-opt for bug 30825 · 3579cdfc
unknown authored Oct 23, 2007

3579cdfc
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · fd721c36
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
fd721c36
Merge mysql.com:/home/hf/work/30638/my50-30638 · f3c632dd
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  merging
```
f3c632dd
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 97d42ff3
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
```
97d42ff3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 3fbb2511
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
3fbb2511
type conversion fixed to get rid of warnings · 72de8440
unknown authored Oct 23, 2007
```
sql/opt_range.cc:
  type conversion fixed
```
72de8440
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 698c0ac4
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
698c0ac4
merging · 63a90767
unknown authored Oct 23, 2007

63a90767
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ed3117c5
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
ed3117c5
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 894def5a
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
894def5a

Merge mysql.com:/home/hf/work/30638/my50-30638 · cbe55306

unknown authored Oct 23, 2007

into  mysql.com:/home/hf/work/30638/my51-30638


sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
sql/opt_range.cc:
  merging
sql/sql_map.cc:
  merging
storage/federated/ha_federated.cc:
  merging
storage/heap/ha_heap.cc:
  merging

cbe55306

type conversions fixed to avoid warnings on Windows · c44daa8e

unknown authored Oct 23, 2007


myisam/mi_write.c:
  type conversion fixed
myisam/sort.c:
  type conversion fixed
sql/ha_federated.cc:
  type conversion fixed
sql/ha_heap.cc:
  type conversion fixed
sql/ha_innodb.cc:
  type conversion fixed
sql/ha_myisam.cc:
  type conversion fixed
sql/opt_range.cc:
  type conversion fixed
sql/sql_map.cc:
  type conversion fixed
sql/sql_select.cc:
  type conversion fixed
sql/sql_update.cc:
  type conversion fixed

c44daa8e