Commits · 21a37ed53204800cf12f82bdc9fd5f50580705fc · nexedi / MariaDB

02 Dec, 2005 12 commits

Merge bk-internal:/home/bk/mysql-5.1-new · 21a37ed5
unknown authored Dec 02, 2005
```
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new1
```
21a37ed5

mysqld.cc: · 014b2ab3

unknown authored Dec 02, 2005

  Fix help message


sql/mysqld.cc:
  Fix help message

014b2ab3

Merge mysql.com:/usr/local/bk/mysql-5.0 · 487f5536

unknown authored Dec 02, 2005

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/r/sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

487f5536

Merge mysql.com:/usr/local/bk/mysql-5.0 · 3b94510a

unknown authored Dec 02, 2005

into  mysql.com:/usr/home/pem/bug14376/mysql-5.0


sql/sp_pcontext.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  SCCS merged
mysql-test/t/sp.test:
  SCCS merged
sql/sp_pcontext.h:
  SCCS merged

3b94510a

Post-review fixes for BUG#14376: MySQL crash on scoped variable (re)initialization · 4cf50da6

unknown authored Dec 02, 2005


sql/sp_pcontext.cc:
  Count boundary for variable visibility from the frame end instead.
sql/sp_pcontext.h:
  Count boundary for variable visibility from the frame end instead.
  Updated comments.
sql/sql_yacc.yy:
  Changed tabs to spaces.

4cf50da6

Merge bk-internal:/home/bk/mysql-5.1-new · de74f787
unknown authored Dec 02, 2005
```
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
```
de74f787

Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE · 05b9e4fc

unknown authored Dec 02, 2005

  -issue more correct message for incorrect date|datetime|time values
  -ER_WARN_DATA_OUT_OF_RANGE message is changed
  -added new error message


mysql-test/r/auto_increment.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/bigint.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ctype_ucs.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/date_formats.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_sapdb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_str.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/func_time.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/insert.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/loaddata.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/mysqldump.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_2myisam.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_3innodb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_4heap.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_5merge.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_6bdb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/ps_7ndb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/rpl_rewrite_db.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/sp.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/strict.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/timezone2.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/timezone_grant.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_bit.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_bit_innodb.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_date.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_datetime.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_decimal.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_float.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_newdecimal.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_ranges.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_time.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/type_uint.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/view.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
mysql-test/r/warnings.result:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    result change
sql/share/errmsg.txt:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    -ER_WARN_DATA_OUT_OF_RANGE message is changed
    -added new error message
sql/time.cc:
  Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
    issue more correct message for incorrect date|datetime|time values

05b9e4fc

Merge · b6afba40
unknown authored Dec 02, 2005

b6afba40

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 16580191

unknown authored Dec 02, 2005

into  mysql.com:/usr/home/ram/work/5.0.b12956


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

16580191

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · b8b67f66
unknown authored Dec 02, 2005
```
into  mysql.com:/users/emurphy/src/mysql-5.1-new
```
b8b67f66
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 563fd8b9
unknown authored Dec 02, 2005
```
into  mysql.com:/users/emurphy/src/mysql-5.1-new
```
563fd8b9

BUG#15406: Adding support for transactions to blackhole. · 758d000f

unknown authored Dec 02, 2005

Now when rolling back a transaction on a blackhole table,
the transaction will not be written to the binlog.


sql/ha_blackhole.h:
  Added support for transactions
mysql-test/t/blackhole.test:
  Added a test for transaction support
mysql-test/r/blackhole.result:
  updated test results for transaction support

758d000f

01 Dec, 2005 18 commits

Merge mysql.com:/home/jimw/my/mysql-5.0-clean · e49348e8

unknown authored Dec 01, 2005

into  mysql.com:/home/jimw/my/mysql-5.1-clean


client/mysqldump.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Fix conflict
mysql-test/t/mysqldump.test:
  Fix conflict

e49348e8

Post-merge result file cleanup · acc875f9
unknown authored Dec 01, 2005
```
mysql-test/r/mysqldump.result:
  Fix results
```
acc875f9

Merge selena.:H:/MYSQL/bkt/mysql-5.0 · 1976d814

unknown authored Dec 01, 2005

into  selena.:H:/MYSQL/bkt/mysql-5.1


sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged

1976d814

Merge mysql.com:/home/jimw/my/mysql-4.1-13318 · 049767dc

unknown authored Dec 01, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Resolve conflicts
mysql-test/t/mysqldump.test:
  Resolve conflicts

049767dc

Merge mysql.com:/home/jimw/my/mysql-4.1-12612 · f7e7eede

unknown authored Dec 01, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/func_equal.result:
  Auto merged
mysql-test/t/func_equal.test:
  Auto merged
sql/item_cmpfunc.cc:
  SCCS merged

f7e7eede

Merge mysql.com:/home/jimw/my/mysql-5.0-keysize · 9c57c510
unknown authored Dec 01, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
9c57c510

Enable key lengths of up to 3K on 32-bit platforms. · 9a6107ff

unknown authored Dec 01, 2005


mysql-test/r/bdb.result:
  Add new results
mysql-test/r/innodb.result:
  Add new results
mysql-test/t/bdb.test:
  Add simple test that large keys are allowed
mysql-test/t/innodb.test:
  Add simple test that large keys are allowed
sql/unireg.h:
  Allow key length of 3K even on 32-bit platforms

9a6107ff

Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d99d362

unknown authored Dec 01, 2005

into  selena.:H:/MYSQL/src/#14902-mysql-5.0


mysql-test/r/analyze.result:
  SCCS merged
mysql-test/t/analyze.test:
  SCCS merged

7d99d362

Merge mysql.com:/home/timka/mysql/src/5.1-virgin · b1fca2c5
unknown authored Dec 01, 2005
```
into  mysql.com:/home/timka/mysql/src/5.1-dbg
```
b1fca2c5

Many files: · 000ae475

unknown authored Dec 01, 2005

  Added mmap support for MyISAM engine


configure.in:
  Added mmap support for MyISAM engine
include/my_base.h:
  Added mmap support for MyISAM engine
include/my_sys.h:
  Added mmap support for MyISAM engine
sql/ha_myisam.cc:
  Added mmap support for MyISAM engine
sql/mysql_priv.h:
  Added mmap support for MyISAM engine
sql/mysqld.cc:
  Added mmap support for MyISAM engine
sql/records.cc:
  Added mmap support for MyISAM engine
sql/set_var.cc:
  Added mmap support for MyISAM engine
storage/myisam/mi_close.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_delete_all.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_dynrec.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_extra.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_locking.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_open.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_packrec.c:
  Added mmap support for MyISAM engine
storage/myisam/mi_statrec.c:
  Added mmap support for MyISAM engine
storage/myisam/myisamdef.h:
  Added mmap support for MyISAM engine

000ae475

Fix for bug#11491 Misleading error message if not NULL column set to NULL, · d8647be1

unknown authored Dec 01, 2005

                  SQL mode TRADITIONAL
  Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'


mysql-test/r/auto_increment.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/create.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/insert.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/insert_select.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/key.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/null.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/null_key.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_2myisam.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_3innodb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_4heap.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_5merge.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_6bdb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/ps_7ndb.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/strict.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/view.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/r/warnings.result:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    result change
mysql-test/t/strict.test:
  Fix for bug#11491 Misleading error message if not NULL column set to NULL,
                    SQL mode TRADITIONAL
    test change

d8647be1

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7ceeb05e

unknown authored Dec 01, 2005

into  mysql.com:/usr/home/ram/work/mysql-5.0


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

7ceeb05e

Fix for bug #14304: auto_increment field incorrect set from within stored... · 506a2b6b

unknown authored Dec 01, 2005

Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).


sql/sp_head.cc:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - call thd->cleanup_after_query() to clean next_insert_id.
sql/sql_class.cc:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - save/restore clear_next_insert_id
sql/sql_class.h:
  Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
  - clear_next_insert_id added

506a2b6b

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · e1135c4d

unknown authored Dec 01, 2005

into  mysql.com:/home/timka/mysql/src/5.1-dbg


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged

e1135c4d

Fix for bug#9785 SELECT privilege for the whole database · e1973fd2

unknown authored Dec 01, 2005

                 is needed to do SHOW CREATE DATABASE
  To allow SHOW CREATE DATABASE when the user can use the database


mysql-test/r/show_check.result:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    test result
mysql-test/t/show_check.test:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    test case
sql/sql_show.cc:
  Fix for bug#9785 SELECT privilege for the whole database 
                   is needed to do SHOW CREATE DATABASE
    removed unnecessary code

e1973fd2

Merge mysql.com:/home/timka/mysql/src/5.0-virgin · c1a05438

unknown authored Dec 01, 2005

into  mysql.com:/home/timka/mysql/src/5.0-bug-14920


sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/group_min_max.result:
  Manually merged test cases.
mysql-test/t/group_min_max.test:
  Manually merged test cases.

c1a05438

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8784b014

unknown authored Dec 01, 2005

into mysql.com:/home/gluh/MySQL/Merge/5.1-new


mysql-test/r/information_schema.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

8784b014

Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value · 65f8e2ab

unknown authored Dec 01, 2005

  store TABLES.TABLE_TYPE in case of error during table opening


mysql-test/r/information_schema.result:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case
mysql-test/t/information_schema.test:
  Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
    test case

65f8e2ab

30 Nov, 2005 10 commits

Merge mysql.com:/home/jimw/my/mysql-5.1-release · 83c989a8

unknown authored Nov 30, 2005

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/t/alter_table.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/show_check.result:
  Resolve conflict
sql/authors.h:
  Resolve conflicts, update replication/backup developers

83c989a8

After-merge cleanups to alter_table test · b648496e

unknown authored Nov 30, 2005


mysql-test/r/alter_table.result:
  Add drop table that got axed in merge
mysql-test/t/alter_table.test:
  Fix merge

b648496e

Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 28e9a498
unknown authored Nov 30, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.1-clean
```
28e9a498
Merge mysql.com:/home/jimw/my/mysql-5.0-14610 · 48d3869a
unknown authored Nov 30, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
48d3869a
Fix union.result · b8fdba58
unknown authored Nov 30, 2005
```
mysql-test/r/union.result:
  Fix order of test results
```
b8fdba58

Merge mysql.com:/home/jimw/my/mysql-5.0-clean · e5586637

unknown authored Nov 30, 2005

into  mysql.com:/home/jimw/my/mysql-5.1-clean


VC++Files/sql/mysqld.dsp:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/alter_table.result:
  Resolve conflict
mysql-test/t/alter_table.test:
  Resolve conflict

e5586637

Merge bk-internal:/home/bk/mysql-5.0 · b8d88dca

unknown authored Nov 30, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


vio/viosslfactories.c:
  Auto merged

b8d88dca

Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2b5e160e
unknown authored Nov 30, 2005
```
into  mysql.com:/home/timka/mysql/src/5.0-virgin
```
2b5e160e
Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 2e01ef75
unknown authored Nov 30, 2005
```
into mysql.com:/home/gluh/MySQL/Merge/5.0


vio/viosslfactories.c:
  Auto merged
```
2e01ef75

WL#2486 - natural/using join according to SQL:2003 · f5e15a98

unknown authored Nov 30, 2005

Commented out one failing query in the regression test (reported as a bug).


mysql-test/r/join.result:
  Commented out failing query.
mysql-test/t/join.test:
  Commented out failing query.

f5e15a98