Commits · 607e99d08e8337d016f7bfaae788ded24c429501 · Kirill Smelkov / mariadb

15 Sep, 2006 14 commits

Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 607e99d0

unknown authored Sep 15, 2006

into  shellback.(none):/home/msvensson/mysql/work/my51-work


configure.in:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  SCCS merged

607e99d0

Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 · 6373941a
unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged
```
6373941a
Merge msvensson.mysql.internal:mysql/my50-m-bug16574 · 05b14821
unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
05b14821
Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 507edfc2
unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work


configure.in:
  Auto merged
```
507edfc2
Merge msvensson.mysql.internal:mysql/my50-m-bug16576 · e15148ad
unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work


configure.in:
  Auto merged
```
e15148ad
Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 2d755a34
unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work


include/my_global.h:
  Auto merged
```
2d755a34
Merge msvensson.mysql.internal:mysql/my50-m-bug21222 · 040c9378
unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my50-work
```
040c9378
Merge shellback.(none):/home/msvensson/mysql/work/my50-work · 581e2fd1
unknown authored Sep 15, 2006
```
into  shellback.(none):/home/msvensson/mysql/work/my51-work
```
581e2fd1
Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t · 6653bfb3
unknown authored Sep 15, 2006
```
extra/yassl/testsuite/test.hpp:
  Remove define for __MACH__
  http://bugs.debian.org/387369
```
6653bfb3

Merge shellback.(none):/home/msvensson/mysql/work/my50-work · cdc2c4e9

unknown authored Sep 15, 2006

into  shellback.(none):/home/msvensson/mysql/work/my51-work


sql/mysqld.cc:
  Auto merged
vio/viosocket.c:
  Auto merged

cdc2c4e9

Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown · 3860571e
unknown authored Sep 15, 2006

3860571e
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 549c922b
unknown authored Sep 14, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51


sql/sql_parse.cc:
  Auto merged
```
549c922b
Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca · 8c3b5d22
unknown authored Sep 15, 2006
```
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged
```
8c3b5d22

Bug#21011 The [client] group header was overwritten by "password" option in... · ef218ff9

unknown authored Sep 15, 2006

Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option

client/mysql_upgrade.c:
The "password" option should be issued after group header to upgrade_defaults file whenever it is used

ef218ff9

14 Sep, 2006 8 commits

Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory leak. · 38a9dea4
unknown authored Sep 14, 2006
```
storage/archive/ha_archive.cc:
  Remove dup() call from azdopen(&archive, create_file, ...), as it resulted in a memory leak.
```
38a9dea4

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424 · 2bc96e39

unknown authored Sep 14, 2006

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


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

2bc96e39

Bug#21424 mysqldump failing to export/import views. ... · 0aa344f3

unknown authored Sep 14, 2006

Bug#21424 mysqldump failing to export/import views.

Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored.
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.

client/mysqldump.c:
When the flush-privileges command line option is specified, make sure to FLUSH PRIVILEGES after only the mysql database's tables' data is restored so that grant tables are current.
mysql-test/r/mysqldump.result:
Added Results.
mysql-test/t/mysqldump.test:
Expanded existing test case for bug 21527 to also test for bug 21424.
Exercises new --flush-priviliges command line option.
Test ignores log tables.

0aa344f3

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix · a6853497
unknown authored Sep 14, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
```
a6853497

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix · d3907c92

unknown authored Sep 14, 2006

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


BitKeeper/triggers/post-commit:
  SCCS merged

d3907c92

/usr/sbin not always in PATH environment variable. · 2c79eff8

unknown authored Sep 14, 2006


BitKeeper/triggers/post-commit:
  Attempt to default to /usr/sbin/sendmail if it exists, otherwise use sendmail.

2c79eff8

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · f770b697
unknown authored Sep 14, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
f770b697

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my50-bug21618 · 81899a0c

unknown authored Sep 14, 2006

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


client/mysql.cc:
  Manual merge.
mysql-test/r/mysql.result:
  Manual merge.
mysql-test/t/mysql.test:
  Manual merge.

81899a0c

13 Sep, 2006 18 commits

Merge bk-internal:/home/bk/mysql-5.1-maint · 3c6ca775

unknown authored Sep 13, 2006

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/51-mrg50


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

3c6ca775

Post-merge fixes: · 3f2f1c2b

unknown authored Sep 13, 2006

- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc


client/Makefile.am:
  Post-merge fix
mysql-test/include/loaddata_autocom.inc:
  Add dummy primary key to test table, because NDB doesn't like BLOB w/ no PK
mysql-test/r/loaddata_autocom_innodb.result:
  Adapt test results to modified loaddata_autocom.inc
mysql-test/r/loaddata_autocom_ndb.result:
  Adapt test results to modified loaddata_autocom.inc
server-tools/instance-manager/Makefile.am:
  Post-merge fix
sql/log.h:
  Post-merge fix
storage/innobase/Makefile.am:
  Post-merge fix

3f2f1c2b

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix · d3da7356
unknown authored Sep 13, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
```
d3da7356

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix · 198b266a

unknown authored Sep 13, 2006

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


BitKeeper/etc/ignore:
  auto-union
BitKeeper/triggers/post-commit:
  Manual merge.  Opted for the method that uses temp files for improved troubleshooting.

198b266a

These bitKeeper changes will allow Windows to be used as a primary development platform. · e90f2c4f

unknown authored Sep 13, 2006


BitKeeper/etc/ignore:
  Exclude files created during the Windows build process.
BitKeeper/triggers/post-commit:
  post-commit trigger writes emails to file in the BitKeeper/tmp directory before sending in case of failure.
  Now uses bk sendmail instead of hardcoded /usr/sbin/sendmail to send message.

e90f2c4f

Fixed the faulty merge · c10a90f2
unknown authored Sep 13, 2006

c10a90f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · d95367b7
unknown authored Sep 13, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
d95367b7

Bug #21618: NULL shown as empty string in client · 306827a5

unknown authored Sep 13, 2006

The column's NOT NULL flag doesn't affect what we should print.  Remove the
wrong logic that does check it.

Also, verify that this and the previous two tests print the same data as 
other output formats.


client/mysql.cc:
  Don't check the column's NOT NULL flag when determining whether to print 
  "NULL" or not.
mysql-test/r/mysql.result:
  Add results and confirm that the other output forms give the same results
  for other similar tests.
mysql-test/t/mysql.test:
  Add regression tests for this bug and two similar bugs.

306827a5

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 3505bee9
unknown authored Sep 13, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
3505bee9
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0--windows-vio-uninit · f70015d1
unknown authored Sep 13, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


vio/viosocket.c:
  Auto merged
```
f70015d1
Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583 · 28502300
unknown authored Sep 13, 2006
```
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint


sql/item_strfunc.cc:
  Auto merged
```
28502300

Merge maint1.mysql.com:/data/localhome/cmiller/bug15583/my50-bug15583 · 76862eaf

unknown authored Sep 13, 2006

into  maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583


mysql-test/r/type_bit.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

76862eaf

Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm · 6a490444

unknown authored Sep 13, 2006

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


mysql-test/r/insert_select.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

6a490444

Merge polly.local:/tmp/20924/bug20294/my51-bug20294 · fe4faf61
unknown authored Sep 13, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx


sql/sql_class.h:
  Auto merged
```
fe4faf61

Merge polly.local:/tmp/20924/bug20294/my50-bug20294 · 3cae41c6

unknown authored Sep 13, 2006

into  polly.local:/tmp/20924/bug20294/my51-bug20294


mysql-test/r/case.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/user_var.result:
  Manual merge
mysql-test/t/user_var.test:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/item_func.h:
  Manual merge

3cae41c6

Merge polly.local:/tmp/20924/bug20294/my41-bug20294 · b419501e

unknown authored Sep 13, 2006

into  polly.local:/tmp/20924/bug20294/my50-bug20294


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/case.result:
  Manual merge
mysql-test/r/func_if.result:
  Manual merge
mysql-test/r/func_test.result:
  Manual merge
mysql-test/r/user_var.result:
  Manual merge
mysql-test/t/case.test:
  Manual merge
mysql-test/t/func_if.test:
  Manual merge
mysql-test/t/func_test.test:
  Manual merge
mysql-test/t/user_var.test:
  Manual merge
sql/item_func.cc:
  Manual merge

b419501e

Cset exclude: kaa@polly.local|ChangeSet|20060912122540|09861 · 418ae41b

unknown authored Sep 13, 2006

Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983


sql/item_cmpfunc.cc:
  Exclude
sql/item_cmpfunc.h:
  Exclude
sql/item_func.cc:
  Exclude
sql/item_func.h:
  Exclude
sql/log_event.cc:
  Exclude
sql/sql_class.h:
  Exclude
mysql-test/r/case.result:
  Exclude
mysql-test/r/func_if.result:
  Exclude
mysql-test/r/func_test.result:
  Exclude
mysql-test/r/user_var.result:
  Exclude
mysql-test/t/case.test:
  Exclude
mysql-test/t/func_if.test:
  Exclude
mysql-test/t/func_test.test:
  Exclude
mysql-test/t/user_var.test:
  Exclude

418ae41b

Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 · fba86d2b

unknown authored Sep 13, 2006

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51


BUILD/SETUP.sh:
  Auto merged
client/Makefile.am:
  Auto merged
dbug/Makefile.am:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/Makefile.am:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_match.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysys/my_seek.c:
  Auto merged
regex/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.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/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-mytest.c:
  Delete: libmysql/mytest.c
BitKeeper/deleted/.del-make_win_bin_dist:
  Delete: scripts/make_win_bin_dist
BitKeeper/deleted/.del-message.mc~1:
  Delete: sql/message.mc
Makefile.am:
  Manual merge (use local)
configure.in:
  Manual merge (use local)
BitKeeper/deleted/.del-Makefile.in:
  Manual merge (use local)
client/mysqlbinlog.cc:
  Manual merge (use local)
extra/Makefile.am:
  Manual merge (use local)
extra/comp_err.c:
  Manual merge (use local)
extra/yassl/Makefile.am:
  Manual merge (use local)
extra/yassl/taocrypt/Makefile.am:
  Manual merge (use local)
include/my_dbug.h:
  Manual merge (use local)
mysql-test/mysql-test-run.pl:
  Manual merge (use local)
mysql-test/lib/mtr_process.pl:
  Manual merge (use local)
mysys/Makefile.am:
  Manual merge (use local)
server-tools/Makefile.am:
  Manual merge (use local)
sql/Makefile.am:
  Manual merge (use local)
sql/sp.cc:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_class.h:
  Manual merge (use local)
sql/sql_select.cc:
  SCCS merged
sql/table.cc:
  Manual merge
storage/archive/ha_archive.cc:
  Manual merge
storage/heap/Makefile.am:
  Manual merge (use local)
storage/myisam/Makefile.am:
  Manual merge (use local)
storage/myisammrg/Makefile.am:
  Manual merge (use local)
strings/Makefile.am:
  Manual merge (use local)
vio/Makefile.am:
  Manual merge (use local)
zlib/Makefile.am:
  Manual merge (use local)

fba86d2b