Commits · efce1db9d555518ec5a9b4eba953dfdbf2a5b147 · Kirill Smelkov / mariadb

06 Oct, 2006 2 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 · efce1db9
  unknown authored Oct 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  efce1db9
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · fe0ea90c
  unknown authored Oct 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/set_var.cc:
  Auto merged
```
  fe0ea90c
05 Oct, 2006 1 commit

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

04 Oct, 2006 9 commits

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660 · 270d4c9d
unknown authored Oct 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


client/mysqldump.c:
  Auto merged
```
270d4c9d
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660 · 26b34e82
unknown authored Oct 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my51-bug19660


client/mysqldump.c:
  manual merge.
```
26b34e82
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my41-bug19660 · d3144a9d
unknown authored Oct 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19660/my50-bug19660


client/mysqldump.c:
  Auto merged
```
d3144a9d

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 4b494e2f

unknown authored Oct 04, 2006

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


BitKeeper/etc/collapsed:
  auto-union

4b494e2f

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356 · 978989a5

unknown authored Oct 04, 2006

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


BitKeeper/etc/collapsed:
  auto-union
sql/sql_prepare.cc:
  Auto merged

978989a5

Bug#19356: Assert on undefined @uservar in prepared statement execute · f60ea288

unknown authored Oct 04, 2006

The executing code had a safety assertion so that it refused to free Items
that it didn't create.  However, there is a case, undefined user variables,
which would put Items into the list to be freed.

Instead, do something that is more risky in expectation that the code will 
be refactored soon, as Kostja wants to do:  Remove the assertions from 
prepare() and execute().  Put one assertion at a higher level, before 
stmt->set_params_from_vars(), which may then create new to-be-freed Items .


mysql-test/r/ps_11bugs.result:
  Create tests to prove that undefined variables work, as keys and not, and 
  that variables explicitly assigned to Null work.
mysql-test/t/ps_11bugs.test:
  Create tests to prove that undefined variables work, as keys and not, and 
  that variables explicitly assigned to Null work.
sql/sql_prepare.cc:
  Move a safety assertion up one level and higher, because there is 
  legitimately a case where thd->free_list is not NULL going into 
  Prepared_statement::{prepare,execute} methods.
  
  Kostja plans to refactor this code so that it is both safe and works.  
  (Now it works, but isn't very safe.)

f60ea288

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my51-bug19024 · a60c548d
unknown authored Oct 04, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


sql/set_var.cc:
  Auto merged
```
a60c548d

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my50-bug19024 · 7daf06b0

unknown authored Oct 04, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19024/my51-bug19024


mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
sql/set_var.cc:
  Auto merged

7daf06b0

Bug #19024- SHOW COUNT(*) WARNINGS not return Errors · aaef575f

unknown authored Oct 04, 2006

  
The server variable warning_count should include the number of warnings, errors and notes according to the manual


mysql-test/r/user_var.result:
  Added warning_count results.
mysql-test/t/user_var.test:
  Added test case for warning_count.
sql/set_var.cc:
  Added number errors to warning_count.

aaef575f

03 Oct, 2006 18 commits

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

Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT · 78f47b1b

unknown authored Oct 03, 2006


client/mysqldump.c:
  Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT
  
  - Remove old BEGIN syntax and replace with START TRANSATION. Add CONSISTENT SNAPSHOT option for servers that support it.

78f47b1b

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

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

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

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 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 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 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.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 10 commits

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

unknown authored Oct 02, 2006

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


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

ca3d54e1

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · d026ddba
unknown authored Oct 02, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/wl3516/51


sql/log.cc:
  Auto merged
```
d026ddba

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · b92388a2

unknown authored Oct 02, 2006

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge


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

b92388a2

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

unknown authored Oct 02, 2006

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


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

2ac39ce6

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 21070e43

unknown authored Oct 02, 2006

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

21070e43

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 60dc71eb

unknown authored Oct 02, 2006

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


include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Manual merge
sql/mysqld.cc:
  Manual merge

60dc71eb

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 · 57eef6e4
unknown authored Oct 02, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
```
57eef6e4
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 338d024d
unknown authored Oct 02, 2006
```
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
```
338d024d
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 8079917f
unknown authored Oct 02, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
8079917f

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 0ca2e21b

unknown authored Oct 02, 2006

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged

0ca2e21b