Commits · 12ed25e7e38c40c231b4752b918bcb5937d900bd · nexedi / MariaDB

07 Nov, 2006 2 commits

Automerge fix. · 12ed25e7
unknown authored Nov 07, 2006
```
sql/sql_view.cc:
  Manually merged.
```
12ed25e7

Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 · e50678f1

unknown authored Nov 07, 2006

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/kill.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/time.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manually merged.
sql/sql_parse.cc:
  Manually merged.

e50678f1

06 Nov, 2006 1 commit
- Fix a typo in SETUP.sh · da032b99
  unknown authored Nov 06, 2006
```
BUILD/SETUP.sh:
  Fix a typo.
```
  da032b99
05 Nov, 2006 5 commits

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 50ba1a09

unknown authored Nov 06, 2006

into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged

50ba1a09

fix mysql-test-run.pl to support --timezone option, · bf622dad

unknown authored Nov 06, 2006

which got broken during refactoring.


mysql-test/mysql-test-run.pl:
  fix mysql-test-run.pl to support --timezone option

bf622dad

Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191 · fd4b510e
unknown authored Nov 06, 2006
```
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191


sql/tztime.cc:
  Auto merged
```
fd4b510e
Merge outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191 · c96eaa43
unknown authored Nov 05, 2006
```
into  outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191


sql/tztime.cc:
  Auto merged
```
c96eaa43
Add missing DBUG_RETURN() · e32e7ca0
unknown authored Nov 05, 2006

e32e7ca0

04 Nov, 2006 6 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · dd726470
  unknown authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
```
  dd726470
- Remove old comments · 024a1781
  unknown authored Nov 04, 2006
  
  024a1781
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 2ab17061
  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
```
  2ab17061
- Disable user_limits for bug23921 · 9db512b3
  unknown authored Nov 04, 2006
  
  9db512b3
- Updates for abi_check · f4dd92bd
  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
```
  f4dd92bd
- Merge neptunus.(none):/home/msvensson/mysql/my50-m-stress · 4c503b8d
  unknown authored Nov 04, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  4c503b8d
03 Nov, 2006 20 commits

Bug#21114 (Foreign key creation fails to table with name format) · 22b754d8

unknown authored Nov 03, 2006

Fixed the tests for case insensitive platforms


mysql-test/r/parser_bug21114_innodb.result:
  Fixed the tests for case insensitive platforms
mysql-test/t/parser_bug21114_innodb.test:
  Fixed the tests for case insensitive platforms

22b754d8

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

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"

a1c79995

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

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

c88ab7a0

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

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

62150851

Fix problem with mysql.test relying on "echo" behaviour · 52f70ab8

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

52f70ab8

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

16a671c0

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

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

7bc532ae

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · 566ba6cd
unknown authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
```
566ba6cd

Use lowercase for "Too long dbname" test as it will be put ot lower on some... · cb404c2d

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.

cb404c2d

Remove sql_state-h from list of include files. (Merge error from 4.1) · a0b3f213
unknown authored Nov 03, 2006

a0b3f213
Merge neptunus.(none):/home/msvensson/mysql/my41-m-stress · 94776f1e
unknown authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/my50-m-stress
```
94776f1e
Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well. · d7d05682
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"
```
d7d05682

Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-monty · cf6ec104

unknown authored Nov 03, 2006

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged


mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Manual merged.
server-tools/instance-manager/instance.cc:
  Manual merged.
server-tools/instance-manager/mysql_connection.cc:
  Manual merged.

cf6ec104

Merge bk-internal:/home/bk/mysql-5.0-maint · f337a747
unknown authored Nov 03, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
f337a747
Fix typo, Add "s" to format specifier for --stress-init-file · 39e39439
unknown authored Nov 03, 2006

39e39439
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 71936a11
unknown authored Nov 03, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
```
71936a11
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup · 3157f257
unknown authored Nov 03, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-cleanup
```
3157f257

Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-cleanup · ab495e50

unknown authored Nov 03, 2006

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-cleanup


mysql-test/r/rename.result:
  Manual merge.
mysql-test/t/rename.test:
  Manual merge.

ab495e50

Cleanup: fix race in rename.test. · 0d92b178

unknown authored Nov 03, 2006


mysql-test/r/rename.result:
  Update result.
mysql-test/t/rename.test:
  Remove the race by replacing sleep with a reap.

0d92b178

02 Nov, 2006 6 commits

Fix merge collision. · 65e36462
unknown authored Nov 02, 2006

65e36462

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 75ed6f1a

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.

75ed6f1a

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

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.

f0364b7b

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

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.

e1a722b2

Merge bk-internal:/home/bk/mysql-4.1-maint · 2772d9e1
unknown authored Nov 02, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
```
2772d9e1
Post merge fix · 0af0c443
unknown authored Nov 02, 2006

0af0c443