Commits · cf6b57382421aa39df33c0b8a65f6d14ace169c7 · Kirill Smelkov / mariadb

14 Sep, 2006 1 commit

Merge neptunus.(none):/home/msvensson/mysql/my50-netware-mtr · cf6b5738

unknown authored Sep 14, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


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

cf6b5738

13 Sep, 2006 16 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
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 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

12 Sep, 2006 17 commits

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


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

Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg/g51 · bc053aa0

unknown authored Sep 12, 2006

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


libmysqld/libmysqld.def:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
sql/log.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

bc053aa0

Correct faulty merge, "mysql_priv.h" must be included for the ifdef... · f320b01a
unknown authored Sep 12, 2006
```
Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work
```
f320b01a

Merge polly.local:/tmp/20924/bug20294/my50-bug20294 · 910c0075

unknown authored Sep 12, 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

910c0075

Fixed compilation · d31a3434
unknown authored Sep 12, 2006

d31a3434
Merge bk-internal:/home/bk/mysql-5.1-new-maint · 22ce97e3
unknown authored Sep 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
22ce97e3

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

unknown authored Sep 12, 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

db141b6b

Merge neptunus.(none):/home/msvensson/mysql/tmp_merge · 1fff863a

unknown authored Sep 12, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged

1fff863a

Merge neptunus.(none):/home/msvensson/mysql/tmp_merge · 2fb56652
unknown authored Sep 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
2fb56652

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

unknown authored Sep 12, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql/share/errmsg.txt:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  SCCS merged

bba3a1be

Merge naruto.:C:/cpp/bug20789/my50-bug20789 · 381f3967
unknown authored Sep 12, 2006
```
into  naruto.:C:/cpp/mysql-5.1-maint


storage/myisam/mi_locking.c:
  Auto merged
```
381f3967

Post-review fixes for bug #20924 · 5aa6e861

unknown authored Sep 12, 2006


mysql-test/r/case.result:
  Post-review fix for bug #20924
mysql-test/r/func_if.result:
  Post-review fix for bug #20924
mysql-test/r/func_test.result:
  Post-review fix for bug #20924
mysql-test/r/user_var.result:
  Post-review fix for bug #20924
mysql-test/t/case.test:
  Post-review fix for bug #20924
mysql-test/t/func_if.test:
  Post-review fix for bug #20924
mysql-test/t/func_test.test:
  Post-review fix for bug #20924
mysql-test/t/user_var.test:
  Post-review fix for bug #20924
sql/item_func.cc:
  Post-review fix for bug #20924
sql/item_func.h:
  Post-review fix for bug #20924
sql/log_event.cc:
  Post-review fix for bug #20924

5aa6e861

Bug#20789 Merge Subtable Rename Causes Crash · 3ca91645

unknown authored Sep 12, 2006

 - When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file 
   descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge
   table causes a server crash on windows. This patch adds a test for bad file descriptors when a 
   table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES
   will be necessary to further operate on the associated merge table.


myisam/mi_locking.c:
  This patch prevents the windows built to crash if the file is closed.
mysql-test/r/windows.result:
  Added test case for the windows built.
mysql-test/t/windows.test:
  Added test case for the windows built.

3ca91645

Merge neptunus.(none):/home/msvensson/mysql/tmp_merge · 2214e282

unknown authored Sep 12, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Null merge backported changes
mysql-test/lib/mtr_cases.pl:
  Null merge backported changes
mysql-test/lib/mtr_match.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Null merge backported changes
mysql-test/r/ctype_ucs.result:
  SCCS merged
mysql-test/t/ctype_ucs.test:
  Null merge, fixed in 5.0 already
BUILD/SETUP.sh:
  Merge
mysql-test/r/myisam.result:
  Merge
mysql-test/t/myisam.test:
  Merge
support-files/mysql.spec.sh:
  Merge
tests/mysql_client_test.c:
  Merge

2214e282

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · c4812a0a
unknown authored Sep 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
c4812a0a

log.cc: · 9e89ea6f

unknown authored Sep 12, 2006

  Fixing failed merge


sql/log.cc:
  Fixing failed merge

9e89ea6f

Change stolen from the -win tree. · 3f77f0dd

unknown authored Sep 12, 2006

More specifically, the scripts/Makefile isn't created and it doesn't
translate mysql_fix_privilege_tables ".sh" .  So, 
mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
/bin/false instead.  That obviously doesn't "fix" anything and the 
test fails because of it.


mysql-test/t/system_mysql_db_fix.test:
  Change stolen from the -win tree.

3f77f0dd

11 Sep, 2006 2 commits
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 567561ed
  unknown authored Sep 11, 2006
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
```
  567561ed
- Use the mtr_file_exists function to detect if ndbapi_example is available · 8cfdb8eb
  unknown authored Sep 11, 2006
  
  8cfdb8eb
09 Sep, 2006 2 commits
- bugfix · a822d651
  unknown authored Sep 09, 2006
  
  a822d651
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 2eb8437d
  unknown authored Sep 09, 2006
```
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch
```
  2eb8437d
08 Sep, 2006 2 commits

Fix initialized memory. Count the number of failures in shm-closing · e44a9232

unknown authored Sep 08, 2006

functions and return it.


vio/viosocket.c:
  Initialize the return code and set it according to errors in the closing 
  functions.

e44a9232

"crash_commit_before" need innodb · b430d54a

unknown authored Sep 08, 2006


mysql-test/t/crash_commit_before.test:
  Server need to be compiled with innodb support for this test case to suceed

b430d54a