Commits · 53999adf67e8ace974e39dacd6398310bc0de636 · nexedi / MariaDB

13 Jun, 2007 3 commits

Merge trift2.:/MySQL/M50/merge-5.0 · 53999adf

unknown authored Jun 13, 2007

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


configure.in:
  Auto merged
netware/comp_err.def:
  Auto merged
netware/isamchk.def:
  Auto merged
netware/isamlog.def:
  Auto merged
netware/libmysql.def:
  Auto merged
netware/my_print_defaults.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
sql/Makefile.am:
  Keep the existing version, the only difference is formatting.

53999adf

Merge trift2.:/MySQL/M41/tmp-4.1 · e076792b

unknown authored Jun 13, 2007

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


configure.in:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
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
sql/item_func.cc:
  Auto merged
netware/my_print_defaults.def:
  5.0 already has 128 kB stack size.
sql/Makefile.am:
  Manual merge.

e076792b

sql/item_func.cc · 99db65d6

unknown authored Jun 13, 2007

    Improved check for thread identity in the "embedded" case,
    provided by Monty.
    
    This finishes the fixes for bug#27078.


sql/item_func.cc:
  Improved check for thread identity in the "embedded" case,
  provided by Monty.
  
  This finishes the fixes for bug#27078.

99db65d6

12 Jun, 2007 1 commit

make_win_bin_dist: · 5c6259e6

unknown authored Jun 12, 2007

  Aligned headers to include with Unix 'make install'


scripts/make_win_bin_dist:
  Aligned headers to include with Unix 'make install'

5c6259e6

11 Jun, 2007 1 commit
- Merge trift2.:/MySQL/M41/push-4.1 · 66c59ea6
  unknown authored Jun 11, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  66c59ea6
08 Jun, 2007 1 commit

Add a cast, needed by some platforms. · 3737db15

unknown authored Jun 08, 2007

Still part of the fix for bug#27078.


libmysqld/lib_sql.cc:
  Some platforms need a cast.
  Still part of the fix for bug#27078.

3737db15

07 Jun, 2007 4 commits

Do not use the "thd" pointer to identify a thread in the embedded lib, · c78aea1e

unknown authored Jun 07, 2007

but rather use the "thread_id" counter.

Fixes bug#27078:
Compile error: lib_sql.cc cast from 'THD*' to 'pthread_t' loses precision


libmysqld/lib_sql.cc:
  Avoid casting a pointer to a (possibly) int, which will not compile on some platforms:
  Do not use the "thd" pointer to identify a thread in the embedded lib,
  but rather use the "thread_id" counter.
  
  Patch is proposed by Monty.  Fixes bug#27078.

c78aea1e

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

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

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

c06e3435

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

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)

71516c02

06 Jun, 2007 7 commits

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

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

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

cfc1512e

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

Merge trift2.:/MySQL/M41/push-4.1 · ec6f93c7

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

ec6f93c7

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


configure.in:
  Auto merged
```
9352fe32
Raise version number after cloning 4.1.23 · 7430e256
unknown authored Jun 06, 2007

7430e256

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

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

f5dc3306

05 Jun, 2007 3 commits

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

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

6e6d0c31

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

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

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

fdc8bc70

04 Jun, 2007 6 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 63beae9a
  unknown authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my41-bug24400
```
  63beae9a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · a998c2c8
  unknown authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my50-bug24400
```
  a998c2c8
- Merge amd64.(none):/src/bug24400/my41-bug24400 · dbb870bc
  unknown authored Jun 04, 2007
```
into  amd64.(none):/src/bug24400/my50-bug24400


VC++Files/sql/mysqld.dsp:
  Auto merged
```
  dbb870bc
- Merge trift2.:/MySQL/M50/mysql-5.0 · 01f6b189
  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
```
  01f6b189
- Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · fa3f2e77
  unknown authored Jun 04, 2007
```
into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741


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

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

user_var.result: · a8e7c57a

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.

a8e7c57a

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

user_var.result, user_var.test: · e3a5404d

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.

e3a5404d

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

Merge bk-internal:/home/bk/mysql-5.0-opt · 57b1ab50

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

57b1ab50

Bug #26162: Trigger DML ignores low_priority_updates setting · 9d344638

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

9d344638

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

02 Jun, 2007 5 commits

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

item_func.cc: · 1a4fb707

unknown authored Jun 03, 2007

  Post fix for bug#28494.
  The Item_func_set_user_var::check method now silently doesn't use result_field
  if it isn't defined.


sql/item_func.cc:
  Post fix for bug#28494.
  The Item_func_set_user_var::check method now silently doesn't use result_field
  if it isn't defined.

1a4fb707

Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 8ff5607d
unknown authored Jun 02, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
```
8ff5607d
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7184a592
unknown authored Jun 02, 2007
```
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
```
7184a592