Commits · cff921f266e7d1ea21a22084e1c6639359ac730d · nexedi / MariaDB

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


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

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

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

b66058f5

04 Oct, 2006 9 commits

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


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


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


client/mysqldump.c:
  Auto merged
```
7f71e80c

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 6670fd8d

unknown authored Oct 04, 2006

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


BitKeeper/etc/collapsed:
  auto-union

6670fd8d

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

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

ffefdf5a

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

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.)

115121b1

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


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

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

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

09312435

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

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.

a3201b40

03 Oct, 2006 18 commits

Merge bk-internal:/home/bk/mysql-5.1 · 1d2d91af

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

1d2d91af

Bug#19660 mysqldump --single-transaction should be with CONSISTENT SNAPSHOT · 5113f600

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.

5113f600

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

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

2a157b27

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

4c962720

After merge fix. · 84ada48a

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.

84ada48a

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

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.

dbf72ed2

sql_yacc.yy: · 2a3f65a2

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.

2a3f65a2

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

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

9bea5966

After merge fix · bac017b0

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

bac017b0

Fix for the patch for bug#21726: Incorrect result with multiple · 5f502963

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.

5f502963

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

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

b3be8db9

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

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)

ab26e946

Merge bk-internal:/home/bk/mysql-5.1-maint · 0c57d84f
unknown authored Oct 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
0c57d84f

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

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

9207c4d8

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

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

f097517d

after-merge fix: warning adjusted. · 6a969985
unknown authored Oct 03, 2006

6a969985
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 20ce40ad
unknown authored Oct 03, 2006
```
into  mysql.com:/usr/home/ram/work/bug22271/my51-bug22271


sql/field.cc:
  Auto merged
```
20ce40ad

Merge mysql.com:/usr/home/ram/work/bug22271/my50-bug22271 · 259bc248

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

259bc248

02 Oct, 2006 10 commits

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

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

28724749

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


sql/log.cc:
  Auto merged
```
82b3e0a1

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

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

272395e1

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

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

bec01900

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

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

e3a5f3b9

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 7ebf2c2e

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

7ebf2c2e

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 · caf1d197
unknown authored Oct 02, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21081
```
caf1d197
Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl · 02e52e50
unknown authored Oct 02, 2006
```
into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
```
02e52e50
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · 1963341a
unknown authored Oct 02, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
1963341a

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 1e7fe6a2

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

1e7fe6a2