Commits · 29418ca8679a4191ef5121f6f4217bbe5d8d56af · Kirill Smelkov / mariadb

14 Dec, 2007 5 commits

Recorded silly ephemeral test. · 29418ca8
unknown authored Dec 14, 2007

29418ca8

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge · 7fd0ad21

unknown authored Dec 14, 2007

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


CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
client/mysqlcheck.c:
  Manual merge.
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/r/mysqlcheck.result:
  Manual merge.
mysql-test/t/mysqlcheck.test:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_base.cc:
  Manual merge.
sql/sql_delete.cc:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.

7fd0ad21

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 18f5e87e

unknown authored Dec 14, 2007

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


sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/unireg.h:
  Auto merged
sql/item.cc:
  manual merge
sql/log_event.cc:
  manual merge
sql/protocol.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_base.cc:
  manual merge
sql/sql_parse.cc:
  manual merge
sql/sql_select.cc:
  manual merge

18f5e87e

Add profiling support for embedded server. · 72d97dfd
unknown authored Dec 14, 2007
```
libmysqld/lib_sql.cc:
  Start and finish profiling for a query in an embedded server.
```
72d97dfd

Correct complaints of reviewers and clean up test. · f8ccbcc4

unknown authored Dec 14, 2007


mysql-test/r/profiling.result:
  Remove unnecessary verbosity.
  
  Remove section of test that is impossible to test with PS protocol.
mysql-test/t/profiling.test:
  Remove unnecessary verbosity.
  
  Remove section of test that is impossible to test with PS protocol.
sql/sql_profile.h:
  Make bit flags unsigned ints.

f8ccbcc4

11 Dec, 2007 2 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 0813b6f5

unknown authored Dec 10, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/mysql-test-run.pl:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/buf/buf0flu.c:
  Auto merged
storage/innobase/buf/buf0lru.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/include/sync0arr.h:
  Auto merged
storage/innobase/include/sync0rw.h:
  Auto merged
storage/innobase/include/sync0rw.ic:
  Auto merged
storage/innobase/include/sync0sync.h:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/innobase/sync/sync0arr.c:
  Auto merged
storage/innobase/sync/sync0rw.c:
  Auto merged
storage/innobase/sync/sync0sync.c:
  Auto merged

0813b6f5

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 1cdc43dd

unknown authored Dec 10, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


innobase/buf/buf0buf.c:
  use local (null merge)
innobase/buf/buf0flu.c:
  use local (null merge)
innobase/buf/buf0lru.c:
  use local (null merge)
innobase/include/buf0buf.h:
  use local (null merge)
innobase/include/buf0buf.ic:
  use local (null merge)
innobase/include/sync0arr.h:
  Auto merged
innobase/include/sync0rw.h:
  use local (null merge)
innobase/include/sync0rw.ic:
  use local (null merge)
innobase/include/sync0sync.h:
  use local
innobase/os/os0sync.c:
  use local (null merge)
innobase/sync/sync0arr.c:
  use local (null merge)
innobase/sync/sync0rw.c:
  use local (null merge)
innobase/sync/sync0sync.c:
  use local (null merge)
mysql-test/mysql-test-run.pl:
  use local (null merge)

1cdc43dd

10 Dec, 2007 1 commit

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-bug15815 · d802c0ac

unknown authored Dec 10, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41


innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/sync0arr.h:
  Auto merged
innobase/include/sync0rw.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/os/os0sync.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

d802c0ac

07 Dec, 2007 9 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 7d734a87

unknown authored Dec 07, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/mysql-test-run.pl:
  Auto merged

7d734a87

Add a way to remove options which mysql-test-run.pl no longer uses. · f77684f3

unknown authored Dec 07, 2007


mysql-test/mysql-test-run.pl:
  Add a way to remove options which mysql-test-run.pl no longer uses.  Since
  mysql-test-run.pl passes unrecognized options through to mysqld directly,
  it is not possible to just remove an option.  Otherwise it would be given
  to mysqld, which probably will not recognize it and will fail to start.
  
  Instead, we now explicitly ignore the option, and print a warning to
  the user.

f77684f3

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · cba3ed19
unknown authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_table.cc:
  Auto merged
```
cba3ed19

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 284cb0e5

unknown authored Dec 07, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/grant.result:
  Manual merge
mysql-test/t/grant.test:
  Manual merge

284cb0e5

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · a4df2210
unknown authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


sql/sql_table.cc:
  Auto merged
```
a4df2210

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 6e776686

unknown authored Dec 07, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


mysql-test/t/grant.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-simple.c:
  Auto merged
mysql-test/r/grant.result:
  Manual merge

6e776686

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 8c033250

unknown authored Dec 07, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


strings/ctype-simple.c:
  use local (null merge)

8c033250

Make tests more robust (clean up better after grant.test) · 7d3a61e1

unknown authored Dec 07, 2007


mysql-test/r/grant.result:
  Update test results to .test changes
mysql-test/t/grant.test:
  Drop users when done with them, to avoid skewing results of later tests.
  
  For example, running some test which examines the cardinality of the
  mysql.user table would fail if run right after this test, due to the
  extra users.

7d3a61e1

Move the test case for bug #20901 from create.test to grant.test, so · 20bbe71d

unknown authored Dec 07, 2007

testing embedded server works correctly.


mysql-test/r/create.result:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/r/grant.result:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/t/create.test:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).
mysql-test/t/grant.test:
  Move one test from create.test to grant.test, because it actually tests
  privileges (and thus doesn't work with embedded server).

20bbe71d

06 Dec, 2007 2 commits
- Fix compiler warning about wrong integer size (probably harmless) · 2632dbf6
  unknown authored Dec 06, 2007
```
sql/sql_select.cc:
  Fix compiler warning (probably harmless, wrong integer size)
```
  2632dbf6
- ctype-simple.c: Backport quick fix to remove Windows compiler warnings · 18d14b3a
  unknown authored Dec 06, 2007
```
strings/ctype-simple.c:
  Backport quick fix to remove Windows compiler warnings.
```
  18d14b3a
05 Dec, 2007 8 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 80360321

unknown authored Dec 05, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged

80360321

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · a9383147

unknown authored Dec 05, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


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

a9383147

Post-merge fix (reorder tests in ctype_ucs.test) · 98ab044d
unknown authored Dec 05, 2007
```
mysql-test/t/ctype_ucs.test:
  Post-merge fix (fix order of tests to match results).
```
98ab044d

Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 068b6e42

unknown authored Dec 05, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge


client/mysqldump.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
mysql-test/t/log_state.test:
  Manual merge fix-up
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/r/func_misc.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/key.result:
  Manual merge
mysql-test/r/log_state.result:
  Manual merge
mysql-test/suite/binlog/t/binlog_killed.test:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
mysql-test/t/key.test:
  Manual merge
sql/item_strfunc.h:
  Manual merge
strings/ctype-simple.c:
  Manual merge

068b6e42

Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1 · b5f919dd
unknown authored Dec 05, 2007
```
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
```
b5f919dd

Bug#32996 log_tables.test fails sporadically · 6bfa2a01

unknown authored Dec 05, 2007

Only select entries from the general_log that were issued by the current
connection.


mysql-test/r/log_tables.result:
  Update test result.
mysql-test/t/log_tables.test:
  Only select entries from the current thread.

6bfa2a01

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 55a420e1

unknown authored Dec 04, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/r/func_misc.result:
  Manual merge
mysql-test/t/binlog_killed.test:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
sql/item_strfunc.h:
  Manual merge
strings/ctype-simple.c:
  Manual merge

55a420e1

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9f26f5c0

unknown authored Dec 04, 2007

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41


sql/set_var.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Manual merge
mysql-test/t/ctype_ucs.test:
  Manual merge

9f26f5c0

04 Dec, 2007 2 commits

Bug#32966 main.status fails. · d2698c35

unknown authored Dec 04, 2007

Disable failing test case.


mysql-test/t/disabled.def:
  Disable main.status test case.

d2698c35

Bug#32965 main.ctype_create fails. · 93341c8a

unknown authored Dec 04, 2007

Disable failing test case.


mysql-test/t/disabled.def:
  Disable main.ctype_create test case.

93341c8a

02 Dec, 2007 5 commits

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · a6e3e723

unknown authored Dec 02, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

a6e3e723

Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · 6699cc02

unknown authored Dec 02, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

6699cc02

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 416e1d9d

unknown authored Dec 02, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

416e1d9d

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · c1eb6f1e

unknown authored Dec 02, 2007

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


mysql-test/t/insert.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged

c1eb6f1e

Windows-specific fixes in floating point tests. · 5fd87aba

unknown authored Dec 02, 2007


mysql-test/t/insert.test:
  Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result
mysql-test/t/variables.test:
  We need to do replace_result because variables are printed by another procedure.
sql/field.cc:
  Fixed the code to limit the precision to DBL_DIG.

5fd87aba

01 Dec, 2007 6 commits

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · c2b0ea99

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


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

c2b0ea99

Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · ddffc434

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


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

ddffc434

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 187cfae6

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


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

187cfae6

Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 813fc2b9

unknown authored Dec 01, 2007

into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788


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

813fc2b9

Fixed the floating point number tests on Windows. · 1f22720c

unknown authored Dec 01, 2007


mysql-test/r/insert.result:
  Fixed the test cases.
mysql-test/t/cast.test:
  We need to do replace_result because warnings are printed by another procedure.
mysql-test/t/insert.test:
  Windows implements a different rounding rules in printf("%g"), thus we still need to do replace_result.
sql/field.cc:
  Limit the precision to avoid garbage past the significant digits.

1f22720c

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · f95b6832
unknown authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


sql/field.cc:
  Auto merged
```
f95b6832