Commits · 86f3d2d08a3c46830d3c555d13171dcd53ac8039 · nexedi / MariaDB

23 Mar, 2006 16 commits

Merge mysql.com:/usr/home/bar/mysql-5.0 · 86f3d2d0

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-cp932.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-eucjpms.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.

86f3d2d0

Bug#15376: Unassigned multibyte codes are converted to U+0000 · 1b58717c

unknown authored Mar 23, 2006

Mergeing changes into 5.0


mysql-test/r/ctype_eucjpms.result:
  Adding test
mysql-test/r/ctype_ujis.result:
  After merge fix
mysql-test/t/ctype_eucjpms.test:
  Adding test
strings/ctype-cp932.c:
  After merge fix
strings/ctype-eucjpms.c:
  Applying changes to eucjpms, similar to ujis.
  Note: eucjpms appeared in 5.0 so the original patch,
  which was for for 4.1, didn't fix eucjpms.

1b58717c

m_ctype.h: · 1f129403

unknown authored Mar 23, 2006

  Removing duplicate old definition.
  After merge fix for bug#15375


include/m_ctype.h:
  Removing duplicate old definition.
  After merge fix for bug#15375

1f129403

Merge mysql.com:/usr/home/bar/mysql-4.1.b15376 · 8c8e0567

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
sql/sql_string.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
include/m_ctype.h:
  After merge fix.
mysql-test/r/ctype_ujis.result:
  After merge fix

8c8e0567

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c7df2c6a
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
c7df2c6a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5b34888c
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
5b34888c
Merge mysql.com:/usr/home/bar/mysql-5.0 · 2dfd0fa6
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new


sql-common/client.c:
  Auto merged
```
2dfd0fa6

ctype-czech.c: · b31eca1e

unknown authored Mar 23, 2006

  Fixing wrong min_sort_char.


strings/ctype-czech.c:
  Fixing wrong min_sort_char.

b31eca1e

Merge bk-internal:/home/bk/mysql-5.1-new · 763b4f47
unknown authored Mar 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
763b4f47
Merge bk-internal:/home/bk/mysql-5.0 · 6d771166
unknown authored Mar 23, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
6d771166

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 47cee5bf

unknown authored Mar 23, 2006

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/parse_file.cc:
  Auto merged

47cee5bf

Move the replcae result to before the correct select · c3e7925f
unknown authored Mar 23, 2006

c3e7925f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cea5dcf6
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new
```
cea5dcf6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · abbc7e2d
unknown authored Mar 23, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
abbc7e2d

Merge mysql.com:/usr/home/bar/mysql-5.0 · c25669a8

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.1-new


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged

c25669a8

Merge mysql.com:/usr/home/bar/mysql-4.1.b17374 · 859aa2f2

unknown authored Mar 23, 2006

into  mysql.com:/usr/home/bar/mysql-5.0


include/m_ctype.h:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged

859aa2f2

22 Mar, 2006 24 commits
- Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and · 3e6330e7
  unknown authored Mar 23, 2006
```
5.0.18 by not reseting or accessing the info_buffer member
```
  3e6330e7
- Fix unused variable warning · 0003994a
  unknown authored Mar 22, 2006
```
sql/parse_file.cc:
  Remove unused variable
```
  0003994a
- Save core files before removing the data_dir · 40e48024
  unknown authored Mar 22, 2006
  
  40e48024
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 5ae7cf46
  unknown authored Mar 22, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  5ae7cf46
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 8e46f640
  unknown authored Mar 22, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  8e46f640
- ndb: added debug printout to track down a bug · b39ee4ff
  unknown authored Mar 22, 2006
  
  b39ee4ff
- Changed to real_sleep · 9c2bf066
  unknown authored Mar 22, 2006
  
  9c2bf066
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · e03b3b7d
  unknown authored Mar 22, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  e03b3b7d
- Merge bk-internal:/home/bk/mysql-5.1-new · 2e24e378
  unknown authored Mar 22, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  2e24e378
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · f81a6dbe
  unknown authored Mar 22, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
```
  f81a6dbe
- ndb: removed TransporterFacade singleton · dfa9a764
  unknown authored Mar 22, 2006
  
  dfa9a764
- Merge bk-internal:/home/bk/mysql-5.0 · dec3dff2
  unknown authored Mar 22, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  dec3dff2
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 7e78842a
  unknown authored Mar 22, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/fulltext.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
```
  7e78842a
- Fix windows results using "replace_result" · d4eeb4ee
  unknown authored Mar 22, 2006
  
  d4eeb4ee
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0fcf49b4
  unknown authored Mar 22, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
```
  0fcf49b4
- changed comment in disabled.def · 5c207e33
  unknown authored Mar 22, 2006
  
  5c207e33
- continued: · d410ef58
  unknown authored Mar 22, 2006
```
ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour
```
  d410ef58
- Bug#18071 Result from MATCH() uses too many decimals · 9aae1afb
  unknown authored Mar 22, 2006
```
 - Use FORMAT as a workaround to only output the first 6 decimals of the value returned
from MATCH
 - This has been done before


mysql-test/r/fulltext.result:
  Use FORMAT to only output the first 6 decimals from MATCH
mysql-test/t/fulltext.test:
  Use FORMAT to only output the first 6 decimals from MATCH
```
  9aae1afb
- Merge mysql.com:/usr/home/bar/mysql-5.0 · 4ab459ce
  unknown authored Mar 22, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.1-new


sql/table.cc:
  Auto merged
```
  4ab459ce
- Dsiable udf.test waiting for a check wheter udf_example.so exists · 0adda6df
  unknown authored Mar 22, 2006
```
mysql-test/include/have_udf.inc:
  Add comment that a check for udf_example.so must be made
mysql-test/t/disabled.def:
  Disable udf.test
```
  0adda6df
- ha_partition should skip ndb specific flags used by sql apply thread to signal... · 104f2c0c
  unknown authored Mar 22, 2006
```
ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour
```
  104f2c0c
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4b6ac944
  unknown authored Mar 22, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  4b6ac944
- Merge bk-internal:/home/bk/mysql-5.1-new · 578bd3e4
  unknown authored Mar 22, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  578bd3e4
- corrected previous patch · 76313a55
  unknown authored Mar 22, 2006
  
  76313a55