Commits · ec4fc41610d2f9f106e95cf162fc94960c6ffc40 · nexedi / MariaDB

11 Jun, 2007 4 commits
- Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-build · ec4fc416
  unknown authored Jun 11, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  ec4fc416
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 62b7d367
  unknown authored Jun 11, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  62b7d367
- Merge trift2.:/MySQL/M41/push-4.1 · a28ec7b8
  unknown authored Jun 11, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  a28ec7b8
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · 4c40289a
  unknown authored Jun 11, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  4c40289a
08 Jun, 2007 2 commits

unknown authored Jun 08, 2007

  Installing the new file required for tests.


mysql-test/Makefile.am:
  Installing the new file required for tests.

b307fc4d

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 67a19767
unknown authored Jun 08, 2007
```
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b28916
```
67a19767

07 Jun, 2007 6 commits

Merge trift2.:/MySQL/M41/bug23504-4.1 · 35a948f7
unknown authored Jun 07, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
35a948f7

Merge trift2.:/MySQL/M41/bug23504-4.1 · d37e1642

unknown authored Jun 07, 2007

into  trift2.:/MySQL/M50/push-5.0


netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/myisam_ftdump.def:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/myisamlog.def:
  Auto merged
netware/myisampack.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_install_db.def:
  Auto merged
netware/mysql_test_run.def:
  Auto merged
netware/mysql_waitpid.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld.def:
  Auto merged
netware/mysqld_safe.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
netware/mysqltest.def:
  Auto merged
netware/pack_isam.def:
  Auto merged
netware/perror.def:
  Auto merged
netware/replace.def:
  Auto merged
netware/resolve_stack_dump.def:
  Auto merged
netware/resolveip.def:
  Auto merged
netware/my_print_defaults.def:
  Use 5.0 version

d37e1642

Bug#28916 LDML doesn't work for utf8 · af0a3afe

unknown authored Jun 07, 2007

and is not described in the manual
- Adding missing initialization for utf8 collations
- Minor code clean-ups: renaming variables,
  moving code into a new separate function.
- Adding test, to check that both ucs2 and utf8 user
  defined collations work (ucs2_test_ci and utf8_test_ci)
- Adding Vietnamese collation as a complex user defined
  collation example.


include/m_ctype.h:
  Renaming variable names to match collation names (for convenience).
mysys/charset-def.c:
  - Removing redundant declarations for variables declared in m_ctype.h
  - Renaming variable names to match collation names (for convenience).
mysys/charset.c:
  - Renaming "new" to "newcs", to avoid using C reserved word as a variable name
  - Moving UCA initialization code into a separate function
  - The bug fix itself: adding initialization of utf8 collations
strings/ctype-uca.c:
  Renaming variable names to match collation names (for convenience).
strings/ctype.c:
  Increasing buffer size to fit tailoring for languages
  with complex rules (e.g. Vietnamese).
mysql-test/r/ctype_ldml.result:
  Adding test case
mysql-test/std_data/Index.xml:
  Adding Index.xml example with user defined collations.
mysql-test/t/ctype_ldml-master.opt:
  Adding OPT file for the test case,
  to use the example Index.xml file.
mysql-test/t/ctype_ldml.test:
  Adding test case

af0a3afe

netware/*.def : Allocate 128K stack for all executables (bug#23504) · bc671e2f

unknown authored Jun 07, 2007


netware/comp_err.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
  Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
  Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
  Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
  Allocate 128K stack for all executables (bug#23504)

bc671e2f

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl · 3babaecc
unknown authored Jun 07, 2007
```
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b26711
```
3babaecc

Bug#26711 "Binary content 0x00 sometimes becomes 0x5C 0x00 after dump/load" · 2971d645

unknown authored Jun 07, 2007

Problem: "SELECT INTO OUTFILE" created incorrect dumps for BLOBs,
so "LOAD DATA" later incorrectly interpreted 0x5C as the second
byte of a multi-byte sequence, instead of escape character.
Fix: adding escaping of multi-byte heads.


mysql-test/r/ctype_big5.result:
  Adding test case
mysql-test/t/ctype_big5.test:
  Adding test case
sql/sql_class.cc:
  Add escape characters before multi-byte heads.
strings/ctype-big5.c:
  Flagging character set as dangerous for escaping.
strings/ctype-gbk.c:
  Flagging character set as dangerous for escaping.
strings/ctype-sjis.c:
  Flagging character set as dangerous for escaping.

2971d645

06 Jun, 2007 7 commits

Merge trift2.:/MySQL/M41/mysql-4.1 · 1811c893
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
1811c893

Merge trift2.:/MySQL/M50/mysql-5.0 · cdf0327e

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


CMakeLists.txt:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ctype_cp932_binlog.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

cdf0327e

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · cb17b801
unknown authored Jun 06, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41
```
cb17b801

Merge trift2.:/MySQL/M41/push-4.1 · 8a9e32bc

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Version change in 4.1 does not propagate to 5.0

8a9e32bc

Merge trift2.:/MySQL/M41/mysql-4.1 · b33b1bc7
unknown authored Jun 06, 2007
```
into  trift2.:/MySQL/M41/push-4.1


configure.in:
  Auto merged
```
b33b1bc7
Raise version number after cloning 4.1.23 · d3e8ed2c
unknown authored Jun 06, 2007

d3e8ed2c

Merge trift2.:/MySQL/M50/mysql-5.0 · 7ffa8c91

unknown authored Jun 06, 2007

into  trift2.:/MySQL/M50/push-5.0


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

7ffa8c91

05 Jun, 2007 3 commits

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

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

f5bc5381

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/41 · bf70c5df
unknown authored Jun 05, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
```
bf70c5df

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 1c72c3a8

unknown authored Jun 05, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1c72c3a8

04 Jun, 2007 7 commits
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · c3ba8178
  unknown authored Jun 05, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/sql_update.cc:
  Auto merged
```
  c3ba8178
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · befe04cd
  unknown authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my41-bug24400
```
  befe04cd
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 986b92de
  unknown authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my50-bug24400
```
  986b92de
- Merge amd64.(none):/src/bug24400/my41-bug24400 · c04d8460
  unknown authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my50-bug24400


VC++Files/sql/mysqld.dsp:
  Auto merged
```
  c04d8460
- Merge trift2.:/MySQL/M50/mysql-5.0 · da49952b
  unknown authored Jun 04, 2007
```
into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
```
  da49952b
- Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e409a8a5
  unknown authored Jun 04, 2007
```
into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741


mysql-test/mysql-test-run.pl:
  Auto merged
```
  e409a8a5
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a3c8a6d8
  unknown authored Jun 04, 2007
```
into  mysql.com:/home/ram/work/b28652/b28652.5.0
```
  a3c8a6d8
03 Jun, 2007 9 commits

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 7b8af0f5
unknown authored Jun 03, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
```
7b8af0f5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · eb958aff
unknown authored Jun 03, 2007
```
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
```
eb958aff

user_var.result: · e19dcfa9

unknown authored Jun 03, 2007

  Corrected test case result for the bug#28494.
item_func.h, item_func.cc:
  Corrected function names after fix for the bug#28494.


mysql-test/r/user_var.result:
  Corrected test case result for the bug#28494.
sql/item_func.h:
  Corrected function names after fix for the bug#28494.
sql/item_func.cc:
  Corrected function names after fix for the bug#28494.

e19dcfa9

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a6f1d558
unknown authored Jun 03, 2007
```
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
```
a6f1d558

user_var.result, user_var.test: · 4ef02860

unknown authored Jun 03, 2007

  Extended test case for the bug#28494.


mysql-test/t/user_var.test:
  Extended test case for the bug#28494.
mysql-test/r/user_var.result:
  Extended test case for the bug#28494.

4ef02860

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 6c403ec9
unknown authored Jun 03, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
```
6c403ec9

Merge bk-internal:/home/bk/mysql-5.0-opt · b313fe13

unknown authored Jun 03, 2007

into  macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt


mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

b313fe13

Bug #26162: Trigger DML ignores low_priority_updates setting · f9a41f9f

unknown authored Jun 03, 2007

  
The value of "low-priority-updates" option and the LOW PRIORITY
prefix was taken into account at parse time.
This caused triggers (among others) to ignore this flag (if
supplied for the DML statement).
Moved reading of the LOW_PRIORITY flag at run time.
Fixed an incosistency when handling
SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
delayed INSERTs.
Tested by checking the effect of LOW_PRIORITY flag via a 
trigger.


include/thr_lock.h:
  Bug #26162: moved reading of the LOW PRIORITY flag at run time
mysql-test/r/trigger.result:
  Bug #26162: test case
mysql-test/t/trigger.test:
  Bug #26162: test case
sql/set_var.cc:
  Bug #26162: fixed the handling of the "low-priority-updates" option
sql/sql_base.cc:
  Bug #26162: moved reading of the LOW PRIORITY flag at run time
sql/sql_yacc.yy:
  Bug #26162: moved reading of the LOW PRIORITY flag at run time

f9a41f9f

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 2b8b36c3
unknown authored Jun 02, 2007
```
into  amd64.(none):/src/bug24732/my50-bug24732
```
2b8b36c3

02 Jun, 2007 2 commits
- Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 04e2d152
  unknown authored Jun 02, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
```
  04e2d152
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8ded1e81
  unknown authored Jun 03, 2007
```
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
```
  8ded1e81