Commits · 6dbc0c5ab18f6c1f69ef91a5b09359c5378d1eee · Kirill Smelkov / mariadb

02 Nov, 2007 2 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-community · 6dbc0c5a

unknown authored Nov 02, 2007

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


CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

6dbc0c5a

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 4 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

Merge mysql.com:/home/kent/bk/bug24809/mysql-5.0-build · 41c2a2c4

unknown authored Oct 31, 2007

into  mysql.com:/home/kent/bk/bug24809/mysql-5.1-build


cmd-line-utils/libedit/Makefile.am:
  Auto merged

41c2a2c4

30 Oct, 2007 8 commits

Makefile.am: · 1de7e5c0

unknown authored Oct 30, 2007

  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)


cmd-line-utils/libedit/Makefile.am:
  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)

1de7e5c0

Minor Makefile fixes: · 85ba610f

unknown authored Oct 30, 2007

1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".


Makefile.am:
  Add a new "make" target "embedded-test" so that it is easier 
  to test the "embedded server" ("libmyslqd").
  Make it "phony".
  
  Use it via a sub-make within "test-bt" to avoid code duplication.
netware/Makefile.am:
  Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.

85ba610f

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 4123825d
unknown authored Oct 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
4123825d

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 173d8d79

unknown authored Oct 30, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


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

173d8d79

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e3b246d6
unknown authored Oct 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
e3b246d6
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work · 2f0838d5
unknown authored Oct 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
2f0838d5

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 0ca87f8e

unknown authored Oct 30, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


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

0ca87f8e

bug#30630 · b0bc908c
unknown authored Oct 30, 2007

b0bc908c

29 Oct, 2007 14 commits

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · bd00ccb7
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
bd00ccb7

autorun.sh: · 7752cee4

unknown authored Oct 29, 2007

  After review changes


BUILD/autorun.sh:
  After review changes

7752cee4

autorun.sh: · 1b261d3d

unknown authored Oct 29, 2007

Removed innobase from compile-dist, and let it use autorun.sh to avoid
code duplication. Also corrected a problem when searching for one of
"libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

BUILD/autorun.sh:
Removed innobase from compile-dist, and let it use autorun.sh to avoid
code duplication. Also corrected a problem when searching for one of
"libtoolize" and "glibtoolize", now it honors the PATH setting (Bug#31405)

1b261d3d

5.1 has been promoted to "rc" status. · 16c621d3
unknown authored Oct 29, 2007

16c621d3

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 trift2.:/MySQL/M50/push-5.0 · ede89c64

unknown authored Oct 29, 2007

into  trift2.:/MySQL/M51/push-5.1


mysql-test/r/derived.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_cache.cc:
  Null merge of a 5.0 patch, by order of the original author via IRC.

ede89c64

Merge trift2.:/MySQL/M51/mysql-5.1 · a861c70d

unknown authored Oct 29, 2007

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Auto merged
mysql-test/r/partition.result:
  Ensure test for bug number 27816 is in the merged tree.
mysql-test/t/partition.test:
  Ensure test for bug number 27816 is in the merged tree.

a861c70d

Merge trift2.:/MySQL/M41/push-4.1 · a2f5911b
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
a2f5911b

Merge trift2.:/MySQL/M50/clone-5.0 · b63ae73d

unknown authored Oct 29, 2007

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


mysql-test/r/derived.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/type_date.result:
  Null-merge 5.0.50 build clone:
  The test for bug#31221 is already in the receiving tree.
mysql-test/t/type_date.test:
  Null-merge 5.0.50 build clone:
  The test for bug#31221 is already in the receiving tree.

b63ae73d

Merge trift2.:/MySQL/M50/mysql-5.0 · 93265192
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
93265192
Merge trift2.:/MySQL/M41/mysql-4.1 · afa5d5a6
unknown authored Oct 29, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
afa5d5a6
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

Fix for · dfdcaf5f

unknown authored Oct 29, 2007

  Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
  
Reason for the changes is:
  WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE


mysql-test/suite/funcs_1/datadict/datadict_priv.inc:
  1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR)
  2. Add missing subtest with ALTER DATABASE ... UPGRADE ...
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
  Updated results
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
  Updated results

dfdcaf5f

26 Oct, 2007 1 commit

Fix for · 9d4e4249

unknown authored Oct 26, 2007

   Bug#31408 funcs_1: <engine>_trig_03e test fail
Modification:
   The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
   Therefore after REVOKE TRIGGER privilege the 
   - SHOW TRIGGERS
   - SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
   result sets are now empty.


mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  Updated results

9d4e4249

25 Oct, 2007 4 commits

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 8d0cd23e
unknown authored Oct 25, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
8d0cd23e
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 392ade80
unknown authored Oct 25, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
392ade80

add new trigger to prevent certain naming clashes · 80241b44

unknown authored Oct 25, 2007


BitKeeper/triggers/pre-commit.check-case.pl:
  catch duplicate file names, ignoring capitalisation, mostly to avoid changesets where a deleted file foobar and a deleted file FooBar break a tree on case insensitive file systems

80241b44

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 6 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