Commits · a068dfc4137fb85e766caff241cf2d8f4b1c49f6 · nexedi / MariaDB

30 Sep, 2006 7 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · a068dfc4
unknown authored Sep 30, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/my_global.h:
  Auto merged
```
a068dfc4

Post-merge fix. New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt,... · 527096fc

unknown authored Sep 30, 2006

Post-merge fix.  New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.


mysql-test/r/ctype_ucs.result:
  Post-merge fix
mysql-test/r/ctype_utf8.result:
  Post-merge fix
mysql-test/t/ctype_utf8.test:
  Post-merge fix
mysql-test/t/view.test:
  Post-merge fix

527096fc

Merge rama.(none):/home/jimw/my/mysql-5.0-clean · 8d903c62
unknown authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean


include/my_global.h:
  Auto merged
```
8d903c62
Merge rama.(none):/home/jimw/my/mysql-4.1-clean · 9d2d5974
unknown authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
```
9d2d5974

Disable __attribute__ entirely on g++ < 3.4. (Bug #2717) · 89fa50a9

unknown authored Sep 29, 2006


include/my_global.h:
  Disable __attribute__ on g++ < 3.4. There are actually some forms of it that
  are supported, but rather than create more ATTRIBUTE_<foo> macros to handle
  them, it is easier to just disable them all. We will catch the compiler warnings
  with more recent versions of g++.

89fa50a9

Merge bk-internal:/home/bk/mysql-4.1-maint · 09a9e9a2
unknown authored Sep 29, 2006
```
into  rama.(none):/home/jimw/my/mysql-4.1-clean
```
09a9e9a2

Merge siva.hindu.god:/usr/home/tim/m/bk/50 · f849da24

unknown authored Sep 29, 2006

into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
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/func_time.result:
  Auto merged
mysql-test/r/group_by.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/func_time.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_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.h:
  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.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge (use local)
mysql-test/t/ctype_utf8.test:
  Manual merge (use local)
mysql-test/r/ps.result:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/unireg.cc:
  Manual merge

f849da24

29 Sep, 2006 17 commits

Merge siva.hindu.god:/usr/home/tim/m/bk/g51 · d678c613

unknown authored Sep 29, 2006

into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51


include/mysql_com.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/handler/ha_innodb.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge (use local)

d678c613

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

unknown authored Sep 29, 2006

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


sql/mysql_priv.h:
  Auto merged

c681d06f

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 16a06614
unknown authored Sep 29, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
```
16a06614
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778 · efd91571
unknown authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
efd91571
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 · 90a29133
unknown authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
90a29133

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my50-bug20778 · 53de6c39

unknown authored Sep 29, 2006

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


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

53de6c39

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · d91644a0
unknown authored Sep 29, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
d91644a0
Update from Stefan. 2006-09-29 msg id <451BEF1.4030506@mysql.com> · f52333ab
unknown authored Sep 29, 2006
```
mysql-test/r/partition.result:
  Altered results after errmsg update.
```
f52333ab

Merge rama.(none):/home/jimw/my/mysql-5.0-clean · c6e2a2a4

unknown authored Sep 28, 2006

into  rama.(none):/home/jimw/my/mysql-5.1-clean


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
sql/slave.h:
  Resolve conflict
sql/sql_class.h:
  Resolve conflict

c6e2a2a4

Merge bk-internal:/home/bk/mysql-5.0-maint · 39bdf4c4

unknown authored Sep 28, 2006

into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/my_global.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

39bdf4c4

Fix merge of __attribute__ cleanup. · 00820e2b

unknown authored Sep 28, 2006


include/my_sys.h:
  Fix bad merge
sql/set_var.cc:
  Fix bad __attribute__ usage.

00820e2b

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 5b571b5b
unknown authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
5b571b5b
Fixed bad fix for a bad merge. · cb0a8b54
unknown authored Sep 28, 2006

cb0a8b54

Merge rama.(none):/home/jimw/my/mysql-4.1-clean · 44cdd695

unknown authored Sep 28, 2006

into  rama.(none):/home/jimw/my/mysql-5.0-clean


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
include/my_sys.h:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/opt_range.cc:
  Resolve conflict
sql/sql_acl.cc:
  Resolve conflict

44cdd695

Merge rama.(none):/home/jimw/my/mysql-5.0-clean · 069db7e8
unknown authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.1-clean
```
069db7e8
Merge bk-internal:/home/bk/mysql-5.0-maint · 06ae9d0d
unknown authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
06ae9d0d
Merge rama.(none):/home/jimw/my/mysql-5.0-18246 · a59f477c
unknown authored Sep 28, 2006
```
into  rama.(none):/home/jimw/my/mysql-5.0-clean
```
a59f477c

28 Sep, 2006 16 commits

view.test: · 04bf9cc7

unknown authored Sep 29, 2006

  After merge fix


mysql-test/t/view.test:
  After merge fix

04bf9cc7

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 09542617

unknown authored Sep 29, 2006

into  moonbone.local:/work/5505-bug-5.0-opt-mysql


sql/share/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/view.result:
  Manual merge
mysql-test/t/view.test:
  Manual merge

09542617

Fixed bug#5505: Wrong error message on INSERT into a view · d332c37c

unknown authored Sep 29, 2006

On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.

A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.


sql/sql_base.cc:
  Fixed bug#5505: Wrong error message on INSERT into a view
  The update_non_unique_table_error() function now issues proper
  error for an INSERT.
sql/sql_insert.cc:
  Fixed bug#5505: Wrong error message on INSERT into a view
  Issue the ER_NON_INSERTABLE_TABLE error instead of the 
  ER_NON_UPDATABLE_TABLE on insert into a view.
sql/sql_view.cc:
  Fixed bug#5505: Wrong error message on INSERT into a view
  Issue the ER_NON_INSERTABLE_TABLE error instead of the
  ER_NON_UPDATABLE_TABLE on insert into a view.
mysql-test/r/view.result:
  Added the test case for bug#5505: Wrong error message on INSERT into a view
  Corrected a few test cases after fixing bug#5505
mysql-test/t/view.test:
  Added the test case for bug#5505: Wrong error message on INSERT into a view
  Corrected a few test cases after fixing bug#5505
sql/share/errmsg.txt:
  Fixed bug#5505: Wrong error message on INSERT into a view
  Added the ER_NON_INSERTABLE_TABLE error definition.

d332c37c

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 · f27604db
unknown authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
f27604db
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305 · 1b212ad9
unknown authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
```
1b212ad9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · cf01cd6b
unknown authored Sep 28, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
cf01cd6b

Fixed incorrect merge of gluh's reversion of B-g#21432. · 0b199a51

unknown authored Sep 28, 2006


mysql-test/r/ctype_utf8.result:
  Removed test that should have been reverted with gluh's reversion of 
  B-g#21432.
mysql-test/t/ctype_utf8.test:
  Removed test that should have been reverted with gluh's reversion of 
  B-g#21432.

0b199a51

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 · c8a6b027
unknown authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
c8a6b027

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 · 3e93d36d

unknown authored Sep 28, 2006

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Null Merge
storage/innobase/include/univ.i:
  Null Merge

3e93d36d

Bug#22224: Windows build depends on ib_config.h · 69aa7b40

unknown authored Sep 28, 2006

  
This change has already been made to 5.1.


CMakeLists.txt:
  Removed dependancy on ib_config.h
  Added conditionals for InnoDB and BDB directories.
innobase/include/univ.i:
  ib_config.h is not required for Windows.

69aa7b40

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 · d8387be4

unknown authored Sep 28, 2006

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


mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged

d8387be4

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305 · e99cf7ed

unknown authored Sep 28, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305


mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
mysql-test/t/analyse.test:
  manual merge

e99cf7ed

Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D) · 314e1059

unknown authored Sep 28, 2006


mysql-test/r/analyse.result:
  Added Results
mysql-test/t/analyse.test:
  Added test cases to make sure field_str and field_real return correctly.
sql/sql_analyse.cc:
  According the manaul, when declaring a FLOAT(M, N), N equals the number of decimal places and M equals the total number of
  digits in the number.

314e1059

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · a4ac09c1
unknown authored Sep 28, 2006
```
into  zim.(none):/home/brian/mysql/merge-5.1


sql/handler.h:
  Auto merged
```
a4ac09c1
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 · 3044afa8
unknown authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
```
3044afa8
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 · 56b08653
unknown authored Sep 28, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my51-bug21449


sql/stacktrace.c:
  Auto merged
```
56b08653