Commits · 94b0383784a090ce114ebc8dd0ba02a452b26afb · Kirill Smelkov / mariadb

06 Oct, 2006 1 commit

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

unknown authored Oct 06, 2006

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


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
configure.in:
  Use 5.1 version of configure.in

94b03837

05 Oct, 2006 2 commits

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8f332252
unknown authored Oct 05, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-kt
```
8f332252

Added license information display to output of plugins schema, and tagged all... · 76cdfbbd

unknown authored Oct 05, 2006

Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 


include/mysql/plugin.h:
  Adding license information.
plugin/fulltext/plugin_example.c:
  License
sql/ha_ndbcluster.cc:
  License
sql/ha_partition.cc:
  License
sql/handler.h:
  License
sql/log.cc:
  License
sql/sql_show.cc:
  Additional PLUIN display information
storage/archive/ha_archive.cc:
  License information added
storage/blackhole/ha_blackhole.cc:
  License information added
storage/csv/ha_tina.cc:
  License Information
storage/example/ha_example.cc:
  License information
storage/federated/ha_federated.cc:
  License Information
storage/heap/ha_heap.cc:
  License Information
storage/innobase/handler/ha_innodb.cc:
  License Information
storage/myisam/ha_myisam.cc:
  License Information
storage/myisammrg/ha_myisammrg.cc:
  License Information

76cdfbbd

03 Oct, 2006 29 commits

Merge bk-internal:/home/bk/mysql-5.0 · 9cd171e2

unknown authored Oct 03, 2006

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


sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

9cd171e2

Merge bk-internal:/home/bk/mysql-5.1 · c8b64ea1

unknown authored Oct 03, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

c8b64ea1

Merge bk-internal:/home/bk/mysql-5.1-new-rpl · c9970c5b

unknown authored Oct 03, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

c9970c5b

Automerge fix: "Out of range value" error message adjusted to 5.1. · dc4418ed
unknown authored Oct 03, 2006

dc4418ed

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 48759d7a

unknown authored Oct 03, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix


sql/sql_select.cc:
  Auto merged

48759d7a

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4fca6870
unknown authored Oct 03, 2006
```
into  booka.:/home/alik/MySQL/devel/5.0-rt
```
4fca6870

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real · e9ec03f9

unknown authored Oct 03, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix


sql/sql_select.cc:
  Auto merged

e9ec03f9

After merge fix. · 0416b69d

unknown authored Oct 03, 2006


mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Enhance test for bug#21726 to cover statement-based replication of
  function calls.
sql/sql_class.cc:
  Fix typo and whitespace.

0416b69d

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix · af9e2eb1

unknown authored Oct 03, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726


sql/item_func.cc:
  Use local.
sql/log.cc:
  Use local.
sql/set_var.cc:
  Use local.
sql/sql_class.cc:
  Use local.
sql/sql_class.h:
  Use local.
sql/sql_parse.cc:
  Use local.
sql/sql_select.cc:
  Use local.
mysql-test/r/rpl_insert_id.result:
  Use local.
mysql-test/t/rpl_insert_id.test:
  Add result for updated test.

af9e2eb1

Merge bk-internal:/home/bk/mysql-5.0-runtime · 1535da65

unknown authored Oct 03, 2006

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


BitKeeper/etc/collapsed:
  auto-union
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

1535da65

Merge bk-internal:/home/bk/mysql-5.0-rpl · 7d748765

unknown authored Oct 03, 2006

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


client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

7d748765

sql_yacc.yy: · fd5ea175

unknown authored Oct 03, 2006

  After merge fix.
field.cc:
  After merge fix


sql/field.cc:
  After merge fix
sql/sql_yacc.yy:
  After merge fix.

fd5ea175

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · e6340946

unknown authored Oct 03, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/collapsed:
  auto-union
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

e6340946

After merge fix · 7dad8e69

unknown authored Oct 03, 2006


BitKeeper/deleted/.del-ps_6bdb.result:
  Auto merged
client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps.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_7ndb.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged

7dad8e69

Added a missing breakpoint. This could cause · 28644848
unknown authored Oct 03, 2006
```
wrong results in order by in some rare cases.
```
28644848

Fix for the patch for bug#21726: Incorrect result with multiple · 37b5cbdc

unknown authored Oct 03, 2006

invocations of LAST_INSERT_ID.

Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
and no LAST_INSERT_ID_EVENT was issued for binary log.

The solution is to add THD::last_insert_id_used_bin_log, which is much
like THD::last_insert_id_used, but is reset only for upper-level
statements.  This new variable is used to issue LAST_INSERT_ID_EVENT.


mysql-test/r/rpl_insert_id.result:
  For bug#21726, add result for statement-based replication of function
  calls.
mysql-test/t/rpl_insert_id.test:
  For bug#21726, add test case for statement-based replication of function
  calls.
sql/item_func.cc:
  Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.
sql/log.cc:
  Issue LAST_INSERT_ID_EVENT if THD::last_insert_id_used_bin_log is set.
sql/set_var.cc:
  Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.
sql/sql_class.cc:
  Initialize THD::last_insert_id_used_bin_log.
  Fix typo, add whitespace.
sql/sql_class.h:
  Add THD::last_insert_id_used_bin_log.
sql/sql_parse.cc:
  Reset THD::last_insert_id_used_bin_log for upper-level statements.
sql/sql_select.cc:
  Set THD::last_insert_id_used_bin_log for issuing of LAST_INSERT_ID_EVENT.

37b5cbdc

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 270b3aff
unknown authored Oct 03, 2006
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
```
270b3aff

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real · 16336789

unknown authored Oct 03, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726


sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

16336789

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · 4506b26d

unknown authored Oct 03, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/handler/ha_innodb.h:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
sql/share/errmsg.txt:
  Manul merge(conflict with new german text)
sql/unireg.cc:
  Manual merge(as it is in 5.1)

4506b26d

Merge bk-internal:/home/bk/mysql-5.1-maint · 5d6d3f40
unknown authored Oct 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
5d6d3f40
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · b274c522
unknown authored Oct 03, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


scripts/mysqlhotcopy.sh:
  Auto merged
```
b274c522

Merge mysql.com:/usr/home/bar/mysql-4.1-rpl.b8663 · c317c2d2

unknown authored Oct 03, 2006

into  mysql.com:/usr/home/bar/mysql-5.0-rpl


mysql-test/r/cast.result:
  null merge for bug#8663
  It will beed another fix for 5.0
  - changes in new DECIMAL instead of FLOAT
mysql-test/r/ps.result:
  null merge
mysql-test/t/cast.test:
  null merge
mysql-test/t/count_distinct3.test:
  null merge
sql/item_func.cc:
  null merge

c317c2d2

Merge bk-internal:/home/bk/mysql-5.0-maint · 2f040528
unknown authored Oct 03, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
```
2f040528
Merge bk-internal:/home/bk/mysql-4.1-maint · 387aa13c
unknown authored Oct 03, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
```
387aa13c

Merge mysql.com:/usr/home/bar/mysql-4.1.b8663 · dc62ff55

unknown authored Oct 03, 2006

into  mysql.com:/usr/home/bar/mysql-4.1-rpl


mysql-test/r/cast.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
sql/item_func.cc:
  Auto merged

dc62ff55

after-merge fix: warning adjusted. · 59301c14
unknown authored Oct 03, 2006

59301c14
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · f0cd4a83
unknown authored Oct 03, 2006
```
into  mysql.com:/usr/home/ram/work/bug22271/my50-bug22271


sql/field.cc:
  Auto merged
```
f0cd4a83
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 68fa1c27
unknown authored Oct 03, 2006
```
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271


sql/field.cc:
  Auto merged
```
68fa1c27

Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271 · 4a09aeb3

unknown authored Oct 03, 2006

into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271


mysql-test/r/type_bit.result:
  Auto merged
sql/field.cc:
  Auto merged

4a09aeb3

02 Oct, 2006 8 commits

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 55badb12

unknown authored Oct 03, 2006

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


include/m_ctype.h:
  Auto merged
include/my_global.h:
  Manual merge

55badb12

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 · 5d5ef846

unknown authored Oct 03, 2006

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


BitKeeper/etc/ignore:
  auto-union
sql/item_func.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

5d5ef846

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e9275f47
unknown authored Oct 03, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
```
e9275f47
Merge bk-internal:/home/bk/mysql-4.1-maint · 61758d08
unknown authored Oct 03, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
```
61758d08

Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers · cdec7323

unknown authored Oct 03, 2006

This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro


include/m_ctype.h:
  Use macro ATTRIBUTE_FORMAT_FPTR on function pointer
include/my_global.h:
  Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers
  This was available from gcc 3.1, so diable it before that

cdec7323

Merge siva.hindu.god:/usr/home/tim/m/bk/40 · 1b665fa7
unknown authored Oct 02, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/41


scripts/mysqlhotcopy.sh:
  Auto merged
```
1b665fa7
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · ce1a7d99
unknown authored Oct 02, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/41
```
ce1a7d99
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0 · 2f7849df
unknown authored Oct 02, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/40
```
2f7849df