Commits · f3289e88ab75d719186f285b49ae8f56324f3a5a · nexedi / MariaDB

12 Oct, 2006 31 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · f3289e88
unknown authored Oct 12, 2006
```
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
```
f3289e88

Merge polly.local:/tmp/maint/bug22728/my51-bug22728 · 8c2b749e

unknown authored Oct 12, 2006

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/handler.cc:
  Auto merged

8c2b749e

Merge polly.local:/tmp/maint/bug22728/my50-bug22728 · 745327e0

unknown authored Oct 12, 2006

into  polly.local:/tmp/maint/bug22728/my51-bug22728


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
sql/handler.cc:
  Auto merged

745327e0

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 95bbf66b

unknown authored Oct 12, 2006

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


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

95bbf66b

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 423cc0d9

unknown authored Oct 12, 2006

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


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

423cc0d9

Add missing semicolon · 10c20b49
unknown authored Oct 12, 2006

10c20b49

Merge polly.local:/tmp/maint/bug22728/my41-bug22728 · c9fdf801

unknown authored Oct 12, 2006

into  polly.local:/tmp/maint/bug22728/my50-bug22728


mysql-test/r/innodb_mysql.result:
  Null merge from 4.1
mysql-test/t/innodb_mysql.test:
  Null merge from 4.1
sql/handler.cc:
  Null merge from 4.1

c9fdf801

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 97fd26d1

unknown authored Oct 12, 2006

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


netware/BUILD/compile-netware-max-debug:
  Auto merged
netware/BUILD/compile-netware-max:
  Auto merged

97fd26d1

Make all compile-netware-* scripts executable · 3a0346de

unknown authored Oct 12, 2006


netware/BUILD/compile-netware-max:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-max-debug:
  Change mode to -rwxrwxr-x
netware/BUILD/compile-netware-src:
  Change mode to -rwxrwxr-x

3a0346de

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 6640642e

unknown authored Oct 12, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

6640642e

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 9b715aa6

unknown authored Oct 12, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

9b715aa6

Move the reconnect variable to beginning of function · 4894e1c4
unknown authored Oct 12, 2006
```
Fix warning about value from "*ptr++" not being used. Changed it to ptr++ 
```
4894e1c4
Add win paths for mysql_client_test · 17047cc1
unknown authored Oct 12, 2006

17047cc1
5.1 should use libc-2006 by default · 4779c6c1
unknown authored Oct 12, 2006

4779c6c1
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · d3a31b35
unknown authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


netware/BUILD/mwenv:
  Auto merged
```
d3a31b35
Use libc-2003 if available else default to libc · e021bd4d
unknown authored Oct 12, 2006

e021bd4d

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · d6533949

unknown authored Oct 12, 2006

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


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

d6533949

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · a542f321

unknown authored Oct 12, 2006

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


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

a542f321

Look for mysql_client_test in $path_client_bindir · 801cc238
unknown authored Oct 12, 2006

801cc238
Only one switch for ssl(--with-ssl) in 5.1 · 210801f5
unknown authored Oct 12, 2006

210801f5
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 83fd305e
unknown authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
83fd305e
Switch to use yaSSL instead of OpenSSL on Netware · 70f16657
unknown authored Oct 12, 2006

70f16657
Merge bk-internal:/home/bk/mysql-5.1-maint · e64a1d94
unknown authored Oct 12, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
e64a1d94

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 7a70a822

unknown authored Oct 12, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
sql-common/client.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Use remote

7a70a822

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 39683e38

unknown authored Oct 12, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
sql-common/client.c:
  Auto merged

39683e38

Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist · da20a076

unknown authored Oct 12, 2006


mysql-test/lib/mtr_process.pl:
  Remove junk code/comments
  Moved the creation of var/log out of function mtr_kill_leftovers
mysql-test/mysql-test-run.pl:
  Rename 'kill_running_server' to more appropriate name 'kill_running_servers'
  If no var/log dir exists when mtr_kill_leftovers is started it should be created
  Remove "unless" syntax, too perlish
  Fix typo

da20a076

Only print cur_file->filename if cur_file->file is set · d13e275e

unknown authored Oct 12, 2006

MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that

d13e275e

Merge polly.local:/tmp/maint/bug11655/my51-bug11655 · 0d6d7a54

unknown authored Oct 12, 2006

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx


include/my_time.h:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/r/func_time.result:
  Manually merged

0d6d7a54

Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is called · a8372ecf
unknown authored Oct 12, 2006
```
Add DBUG_PRINT to show the value of mysql->reconnect
```
a8372ecf

Merge polly.local:/tmp/maint/bug11655/my50-bug11655 · c623c003

unknown authored Oct 12, 2006

into  polly.local:/tmp/maint/bug11655/my51-bug11655


mysql-test/r/func_time.result:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

c623c003

5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1 · 6bee06c2

unknown authored Oct 12, 2006


mysql-test/r/func_time.result:
  Fixed func_time test when merging the fix for bug #11655 and bug #20927 to 5.0
sql/item_timefunc.cc:
  Fixed compilation when merging the fix for bug #11655 and bug #20927 to 5.0

6bee06c2

11 Oct, 2006 9 commits

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · a181e59e

unknown authored Oct 11, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

a181e59e

Fixes for embedded server test · 6efe4250
unknown authored Oct 11, 2006
```
client/mysqltest.c:
  Fix typo
```
6efe4250
Merge bk-internal:/home/bk/mysql-5.1-maint · 7d247e64
unknown authored Oct 11, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
```
7d247e64
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · cd89b732
unknown authored Oct 11, 2006
```
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


netware/BUILD/mwenv:
  Auto merged
```
cd89b732

Check that TERM has been set to avoid problem "Error opening · ad4b32a9

unknown authored Oct 11, 2006

terminal: unknown" when the script is executed using non interactive ssh
Set TERM to "linux" as default


netware/BUILD/mwenv:
  Check that TERM has been set to avoid problem "Error opening
  terminal: unknown" when the script is executed using non interactive ssh

ad4b32a9

Merge bk-internal:/home/bk/mysql-5.1-maint · 80627965

unknown authored Oct 11, 2006

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge

80627965

Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · 4c960bf1

unknown authored Oct 11, 2006

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


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

4c960bf1

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint · 6b6a3f51

unknown authored Oct 11, 2006

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


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

6b6a3f51

mtr_im_stop returns 1 if all is well · 326f9df2
unknown authored Oct 11, 2006

326f9df2