Commits · b01c89ed8cfc6c8397e8ef492ef75a9bd31d1865 · nexedi / MariaDB

02 Nov, 2007 1 commit

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

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 .

b01c89ed

31 Oct, 2007 3 commits

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

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.

cca4ea27

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

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.

fc70ac46

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

29 Oct, 2007 3 commits

Remove easily-changed and prominent variable that toggled · 41a9bb8c

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.

41a9bb8c

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

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

38ed305e

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

25 Oct, 2007 1 commit

Mimic a rename which Daniel already did in 6.0, · a71a829a

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

a71a829a

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

result fix · b987945d
unknown authored Oct 23, 2007

b987945d

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

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

e085211d

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

985e4a64

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 95a8bb20

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

95a8bb20

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8479eb1d

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

8479eb1d

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

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

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

f102f668

Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 21469c40
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
21469c40
Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · de3eb8fb
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
de3eb8fb
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f7f8ca8b
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
f7f8ca8b
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 2d4639c4
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
2d4639c4
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 619bb76b
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550


sql/filesort.cc:
  SCCS merged
```
619bb76b
type conversions fixed to get rid of warnings · 4e5c8bc7
unknown authored Oct 23, 2007
```
sql/ha_heap.cc:
  type conversion fix
sql/opt_range.cc:
  type conversion fix
```
4e5c8bc7
Merge mysql.com:/home/hf/work/30638/my50-30638 · 0fb0e7ac
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
0fb0e7ac
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 0c77be95
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
0c77be95
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 09c8f3e6
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
```
09c8f3e6
merge 5.0-opt -> 5.1-opt for bug 30825 · 6875b402
unknown authored Oct 23, 2007

6875b402
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 73d08e3a
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
73d08e3a
Merge mysql.com:/home/hf/work/30638/my50-30638 · 707fd691
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  merging
```
707fd691
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · bfa5dd2f
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
```
bfa5dd2f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 084753af
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
084753af
type conversion fixed to get rid of warnings · 8262c4f4
unknown authored Oct 23, 2007
```
sql/opt_range.cc:
  type conversion fixed
```
8262c4f4
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a9a50c72
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
a9a50c72
merging · dafb9894
unknown authored Oct 23, 2007

dafb9894
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a790dd1
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
8a790dd1
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · b249d2a7
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
b249d2a7

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

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

51fddf75

type conversions fixed to avoid warnings on Windows · e1dc86b0

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

e1dc86b0