Commits · 412cb12839d0b9645f49b3c8d472827155772bb3 · nexedi / MariaDB

17 Jan, 2006 4 commits
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 412cb128
  unknown authored Jan 17, 2006
```
into  hundin.mysql.fi:/home/jani/mysql-5.0
```
  412cb128
- Merge jani@193.229.222.105:/my/bk/mysql-5.0 · b9f20e10
  unknown authored Jan 17, 2006
```
into  hundin.mysql.fi:/home/jani/mysql-5.0
```
  b9f20e10
- Merge mysql.com:/extern/mysql/bk/mysql-5.0 · b701a5df
  unknown authored Jan 17, 2006
```
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
```
  b701a5df
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c6fdba0
  unknown authored Jan 17, 2006
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
```
  4c6fdba0
16 Jan, 2006 29 commits

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ac01c17
unknown authored Jan 17, 2006
```
into  hundin.mysql.fi:/home/jani/mysql-5.0
```
4ac01c17
A post-merge fix. · 1f0034fd
unknown authored Jan 17, 2006

1f0034fd

Merge mysql.com:/opt/local/work/mysql-4.1-root · aee04804

unknown authored Jan 17, 2006

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/r/ps.result:
  SCCS merged
mysql-test/t/ps.test:
  SCCS merged

aee04804

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · cf6b2ef1
unknown authored Jan 17, 2006
```
into  mysql.com:/opt/local/work/mysql-4.1-root
```
cf6b2ef1

A fix for Bug#13337 "ps test fails if configure wo/ usc2" · 829a4e4f

unknown authored Jan 17, 2006


mysql-test/r/ctype_ucs.result:
  Test results changed (Bug#13337)
mysql-test/r/ps.result:
  Test results changed (Bug#13337)
mysql-test/t/ctype_ucs.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)
mysql-test/t/ps.test:
  Fix Bug#13337 (move the test that uses UCS character set to 
  ctype_ucs)

829a4e4f

Merge mysql.com:/opt/local/work/mysql-4.1-root · 60454b0d

unknown authored Jan 17, 2006

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

60454b0d

A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat) · 6e21daa7

unknown authored Jan 17, 2006


mysql-test/r/alter_table.result:
  Test results fixed (Bug#6073)
mysql-test/t/alter_table.test:
  A test case for Bug#6073

6e21daa7

Changed condition similar to code in 4.1. · 0ac65f88
unknown authored Jan 16, 2006

0ac65f88
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3320f536
unknown authored Jan 16, 2006
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
```
3320f536

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 · 2a6b720e

unknown authored Jan 16, 2006

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

2a6b720e

A test case for Bug#7670 "Loss of precision for some integer · b1929492

unknown authored Jan 16, 2006

values stored into DOUBLE column" (Can't repeat)


mysql-test/r/type_decimal.result:
  Test results fixed (Bug#7670)
mysql-test/t/type_decimal.test:
  A test case for Bug#7670

b1929492

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · b4d8f9ea
unknown authored Jan 16, 2006
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
```
b4d8f9ea

Post-merge fixes (BUG#14498) · 6dcd4a0f

unknown authored Jan 16, 2006


mysql-test/r/sp-code.result:
  Post-merge fix; updated result.
mysql-test/t/sp.test:
  Post-merge fix; added comment (still can't call bug14498_4 test)

6dcd4a0f

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fec7d3ad
unknown authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554
```
fec7d3ad

Merge · 30eab4fd

unknown authored Jan 16, 2006


mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/sql_table.cc:
  SCCS merged

30eab4fd

Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes · 9df5948c

unknown authored Jan 16, 2006

into  mysql.com:/usr/local/mysql/mysql-5.0-win-test-fixes


mysql-test/mysql-test-run.pl:
  Manual merge.

9df5948c

Merge mysql.com:/extern/mysql/bk/mysql-5.0 · 3ac4f4ce

unknown authored Jan 16, 2006

into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0


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

3ac4f4ce

Two minor fixes to be able to run tests from within a Windows Max · 13c2d8ad
unknown authored Jan 16, 2006
```
build directory.
```
13c2d8ad
Post-review fix (BUG#14498). · 438e7f10
unknown authored Jan 16, 2006
```
sql/sp_pcontext.h:
  Post-review fix.
```
438e7f10
Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b988ee8
unknown authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554
```
1b988ee8
Restore fix for bug #15108 (by ramil) erroneously erased · 5e9e6ab3
unknown authored Jan 16, 2006
```
 by applying innodb-5.0-ss115 snapshot.
```
5e9e6ab3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d1af4a49
unknown authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554
```
d1af4a49
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · b10b785e
unknown authored Jan 16, 2006
```
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss115
```
b10b785e
Merge bk-internal:/home/bk/mysql-4.0 · 97a67732
unknown authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554
```
97a67732
Merge neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554 · 62ffc842
unknown authored Jan 16, 2006
```
into  neptunus.(none):/home/msvensson/mysql/bug6554/my50-bug6554


sql/ha_berkeley.cc:
  Auto merged
```
62ffc842

Merge neptunus.(none):/home/msvensson/mysql/bug6554/my40-bug6554 · 4b448b6c

unknown authored Jan 16, 2006

into  neptunus.(none):/home/msvensson/mysql/bug6554/my41-bug6554


sql/ha_berkeley.cc:
  Merge 4.0 -> 4.1, change is already in 4.1

4b448b6c

Changes from the innodb-5.0-ss115 snapshot. · d61394cf

unknown authored Jan 16, 2006

 Fixed bugs:
 BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
 BUG#15650: "DELETE with LEFT JOIN crashes server"
 BUG#15308: "Problem of Order with Enum Column in Primary Key"
 BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"


innobase/include/data0type.h:
  Changes from the innodb-5.0-ss115 snapshot.
innobase/include/data0type.ic:
  Changes from the innodb-5.0-ss115 snapshot.
   Fixed bug #14189. dtype_get_pad_char(): Do not pad VARBINARY
   or BINARY cloumns.
innobase/include/lock0lock.h:
  Changes from the innodb-5.0-ss115 snapshot.
innobase/include/os0file.h:
  Changes from the innodb-5.0-ss115 snapshot.
   os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and
   EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as
   OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when
   the .ibd file is a symbolic link to a different file system
   (bug#15991).
innobase/include/row0mysql.h:
  Changes from the innodb-5.0-ss115 snapshot.
innobase/lock/lock0lock.c:
  Changes from the innodb-5.0-ss115 snapshot.
   lock_rec_unlock(): Initialize local variable release_lock,
   in order to avoid dereferencing an uninitialized pointer
   when no lock exists on rec.
innobase/os/os0file.c:
  Changes from the innodb-5.0-ss115 snapshot.
   os_file_handle_error(): Map the error codes EXDEV, ENOTDIR, and
     EISDIR to the new code OS_FILE_PATH_ERROR. Treat this code as
     OS_FILE_PATH_ERROR. This fixes the crash on RENAME TABLE when
     the .ibd file is a symbolic link to a different file system
     (bug#15991).
   Protect the increment and decrement operations on the statistic
     variables os_n_pending_writes/reads with os_file_count_mutes.
innobase/row/row0ins.c:
  Changes from the innodb-5.0-ss115 snapshot.
   Fixed bug #14189. row_ins_cascade_calc_update_vec(): Refuse
   ON UPDATE_CASCADE when trying to change the length of of a
   VARBINARY column that refers to or is referenced by a BINARY
   column. BINARY columns are no longer padded on comparison,
   and thus they cannot be padded on storage either.
innobase/row/row0mysql.c:
  Changes from the innodb-5.0-ss115 snapshot.
   Fixed bug on unlock_row. In a unlock_row we may unlock
   only the latest lock granted to this transaction to the row.
innobase/row/row0sel.c:
  Changes from the innodb-5.0-ss115 snapshot.
   Fixed bug #15308.
   Fixed bug #14189: innobase_init(): Assert that
     DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
   After review fixes for unlock bug where unlock released all
     locks transaction requested for a row. Only a latest requested
     lock to a row should be released. Update function comments to
     reflect current state. Persistent cursor should be stored
     whenever select lock type != LOCK_NONE.
innobase/trx/trx0trx.c:
  Changes from the innodb-5.0-ss115 snapshot.
   trx_commit_off_kernel(): Do not write empty trx->mysql_log_file_name.
mysql-test/r/innodb.result:
  Changes from the innodb-5.0-ss115 snapshot.
mysql-test/t/innodb.test:
  Changes from the innodb-5.0-ss115 snapshot.
sql/ha_innodb.cc:
  Changes from the innodb-5.0-ss115 snapshot.
   Fixed bug #15308.
   Fixed bug #14189: innobase_init(): Assert that
     DATA_MYSQL_BINARY_CHARSET_COLL == my_charset_bin.number.
   After review fixes for unlock bug where unlock released all
     locks transaction requested for a row. Only a latest requested
     lock to a row should be released. Update function comments to
     reflect current state. Persistent cursor should be stored
     whenever select lock type != LOCK_NONE.
mysql-test/r/innodb_unsafe_binlog.result:
  Changes from the innodb-5.0-ss115 snapshot.
mysql-test/t/innodb_unsafe_binlog-master.opt:
  Changes from the innodb-5.0-ss115 snapshot.
mysql-test/t/innodb_unsafe_binlog.test:
  Changes from the innodb-5.0-ss115 snapshot.
   Added testcases for bug #15650.

d61394cf

BUG#6554 Problem Building MySql on Fedora Core 3 · b05ce7fc

unknown authored Jan 16, 2006

   - Remove the local static var


sql/ha_berkeley.cc:
  Remove local static var, make it local in file instead.

b05ce7fc

Windows Visual Studio 2003 fixes. · 8a2bc69f

unknown authored Jan 16, 2006


VC++Files/client/mysqldump.vcproj:
  Add new file that was missing from .vcproj.
VC++Files/sql/mysqld.vcproj:
  Add new file that was missing from .vcproj.

8a2bc69f

15 Jan, 2006 3 commits

Null-merge (innodb-4.1-ss14 is not to be applied to · 84462f69

unknown authored Jan 15, 2006

 higher versions)


innobase/include/os0file.h:
  Null-merge
innobase/os/os0file.c:
  Null-merge
mysql-test/r/innodb.result:
  Null-merge
mysql-test/t/innodb.test:
  Null-merge
sql/ha_innodb.cc:
  Null-merge

84462f69

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 · dba0a848
unknown authored Jan 15, 2006
```
into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
```
dba0a848

Changes from innodb-4.1-ss14 snapshot · a8cdf556

unknown authored Jan 15, 2006

 Fixed BUG#14056: Column prefix index on UTF-8 primary key
 causes "Can't find record.."
 Also fixed bug 15991.


innobase/include/os0file.h:
  Changes from innodb-4.1-ss14 snapshot
   os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
   to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
   This fixes the crash on RENAME TABLE when the .ibd file is a symbolic
   link to a different file system. (Bug 15991)
innobase/os/os0file.c:
  Changes from innodb-4.1-ss14 snapshot
   os_file_hadle_error(): Map the error codes EXDEV, ENOTDIR, and EISDIR
   to the new code OS_FILE_PATH_ERROR. Treat this code as OS_FILE_PATH_ERROR.
   This fixes the crash on RENAME TABLE when the .ibd file is a symbolic
   link to a different file system. (Bug 15991)
mysql-test/r/innodb.result:
  Changes from innodb-4.1-ss14 snapshot
   Fixed BUG#14056: Column prefix index on UTF-8 primary key
   causes "Can't find record.."
mysql-test/t/innodb.test:
  Changes from innodb-4.1-ss14 snapshot
   Fixed BUG#14056: Column prefix index on UTF-8 primary key
   causes "Can't find record.."
sql/ha_innodb.cc:
  Changes from innodb-4.1-ss14 snapshot
   Fixed BUG#14056: Column prefix index on UTF-8 primary key
   causes "Can't find record.."

a8cdf556

14 Jan, 2006 3 commits

A post-merge fix (Bug#12734) · 282977e6
unknown authored Jan 14, 2006
```
mysql-test/r/ps.result:
  A post-merge fix.
```
282977e6

Merge mysql.com:/opt/local/work/mysql-4.1-12734 · 8ff5f93a

unknown authored Jan 14, 2006

into  mysql.com:/opt/local/work/mysql-5.0-root


sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
sql/item_cmpfunc.h:
  Manual merge

8ff5f93a

A fix and a test case for Bug#12734 " prepared statement may · 94b55395

unknown authored Jan 14, 2006

return incorrect result set for a select SQL request"


mysql-test/r/ps.result:
  Test results fixed (Bug#12734)
mysql-test/t/ps.test:
  A test case for Bug#12734
sql/item_cmpfunc.cc:
  Reset canDoTurboBM in Item_func_like::cleanup()
sql/item_cmpfunc.h:
  Add Item_func_like::cleanup()

94b55395

13 Jan, 2006 1 commit
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 19255177
  unknown authored Jan 14, 2006
```
into mysql.com:/home/psergey/mysql-5.0-bug16393-r2


sql/sql_select.cc:
  Auto merged
```
  19255177