Commits · c77e435f4fce362873061ebb7eecfb0ed49cff63 · nexedi / MariaDB

10 Nov, 2006 3 commits

Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic · c77e435f

unknown authored Nov 10, 2006

into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic


mysql-test/mysql-test-run-shell.sh:
  Auto merged

c77e435f

Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic · 58462e23

unknown authored Nov 10, 2006

into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic


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

58462e23

mysql-test-run.sh: · 921746a8

unknown authored Nov 10, 2006

  Added --force-restart pseudo server argument to shell version as well


mysql-test/mysql-test-run.sh:
  Added --force-restart pseudo server argument to shell version as well

921746a8

07 Nov, 2006 6 commits

Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic · c1bb389f

unknown authored Nov 07, 2006

into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic


scripts/make_binary_distribution.sh:
  Auto merged

c1bb389f

Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic · 7ab70d56

unknown authored Nov 07, 2006

into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic


scripts/make_binary_distribution.sh:
  Auto merged

7ab70d56

Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic · 0301312d
unknown authored Nov 07, 2006
```
into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic


README:
  Auto merged
```
0301312d

make_binary_distribution.sh: · e6161758

unknown authored Nov 07, 2006

  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt


README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.

e6161758

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 665636c1
unknown authored Nov 07, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1


configure.in:
  Auto merged
```
665636c1

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 18157393

unknown authored Nov 07, 2006

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

18157393

05 Nov, 2006 2 commits
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 2d994738
  unknown authored Nov 05, 2006
```
into  zim.(none):/home/brian/mysql/merge-5.1


sql/mysqld.cc:
  Auto merged
```
  2d994738
- Removed Innodb variable at request of Innobase. · 4c3e21b1
  unknown authored Nov 05, 2006
```
sql/mysqld.cc:
  Removing Innodb variable
sql/set_var.cc:
  Removing Innodb variable
```
  4c3e21b1
04 Nov, 2006 6 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · deecc1b3
  unknown authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
```
  deecc1b3
- Remove old comments · bab65b05
  unknown authored Nov 04, 2006
  
  bab65b05
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 8d3e8673
  unknown authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
```
  8d3e8673
- Disable user_limits for bug23921 · 29032676
  unknown authored Nov 04, 2006
  
  29032676
- Updates for abi_check · 6c8f0b1d
  unknown authored Nov 04, 2006
```
include/Makefile.am:
  Remove abi_check from BUILT_SOURCES it's in the "all" rule
  Make abi_check depend on mysql_h.ic as well
```
  6c8f0b1d
- Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress · dee53381
  unknown authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  dee53381
03 Nov, 2006 14 commits

Fiexes for --stress mode in mysql-test-run.pl · 168df93a

unknown authored Nov 03, 2006


mysql-test/lib/mtr_stress.pl:
  "stop_masters" function renamed to "stop_all_servers"
  "path_mysock" renamed to "path_sock"

168df93a

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · ea225358

unknown authored Nov 03, 2006

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


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

ea225358

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · bc150d33

unknown authored Nov 03, 2006

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


client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
myisam/sort.c:
  Manual merge(double checked)
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
mysys/mf_iocache.c:
  Manual merge

bc150d33

Fix problem with mysql.test relying on "echo" behaviour · 16edab3a

unknown authored Nov 03, 2006


mysql-test/r/mysql.result:
  Update test result after commenting out the test
mysql-test/t/mysql.test:
  Rewrite the test commands so they don't depend on "echo" behaviour
  Comment out one as it's a duplicate

16edab3a

Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd · 9bf47c1c
unknown authored Nov 03, 2006
```
client/mysqltest.c:
  The expanded command executed by mysqltest is in ds_cmd
```
9bf47c1c
Don't warn about "Found non pid file" for elements that are not files. · 155c8de8
unknown authored Nov 03, 2006

155c8de8

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · dc8bc707

unknown authored Nov 03, 2006

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


client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
include/mysql_h.ic:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/my_lock.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote
include/Makefile.am:
  Manual merge

dc8bc707

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 23dd342f
unknown authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
```
23dd342f
Use lowercase for "Too long dbname" test as it will be put ot lower on some... · 2824f718
unknown authored Nov 03, 2006
```
Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that.
```
2824f718
Remove sql_state-h from list of include files. (Merge error from 4.1) · 334b160d
unknown authored Nov 03, 2006

334b160d
Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress · 94ff8647
unknown authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
```
94ff8647
Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well. · 8cca8732
unknown authored Nov 03, 2006
```
mysql-test/lib/mtr_misc.pl:
  Update comments
mysql-test/mysql-test-run.pl:
  Also need to look in "$glob_basedir/bin"
```
8cca8732
Merge bk-internal:/home/bk/mysql-5.0-maint · e2a17c07
unknown authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
e2a17c07
Fix typo, Add "s" to format specifier for --stress-init-file · 054ab261
unknown authored Nov 03, 2006

054ab261

02 Nov, 2006 9 commits

Fix merge collision. · 3a645df9
unknown authored Nov 02, 2006

3a645df9

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 3d76a16a

unknown authored Nov 02, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/log_tables.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
include/my_time.h:
  manual merge.
mysql-test/mysql-test-run.pl:
  manual merge.
mysql-test/r/ps.result:
  manual merge.
mysql-test/t/disabled.def:
  manual merge.
mysql-test/t/ps.test:
  manual merge.

3d76a16a

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 39b2f4a3

unknown authored Nov 02, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.
mysql-test/r/ps.result:
  Manual merge.
mysql-test/t/ps.test:
  Manual merge.

39b2f4a3

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c6913415

unknown authored Nov 02, 2006

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


configure.in:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
myisam/sort.c:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.
mysys/mf_iocache.c:
  Manual merge.

c6913415

Merge bk-internal:/home/bk/mysql-4.1-maint · d3bf5536
unknown authored Nov 02, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
```
d3bf5536

configure.in: · 490d07cf

unknown authored Nov 02, 2006

  Raise version number to 4.1.23


configure.in:
  Raise version number to 4.1.23

490d07cf

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config · 8799830b
unknown authored Nov 02, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
```
8799830b
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config · b755d29a
unknown authored Nov 02, 2006
```
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


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

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config · 114ea1c9

unknown authored Nov 02, 2006

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config


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

114ea1c9