paul@snake-hub.snake.net
6d4dc91bbf
mysqltest.c:
...
Fix typos.
2006-02-28 12:01:24 -06:00
dlenev@mysql.com
8dbdf5237e
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges2
2006-02-27 20:00:07 +03:00
msvensson@neptunus.(none)
90e5ca96be
Look for and "convert" paths that start with $MYSQL_TMP_DIR
2006-02-26 19:54:09 +01:00
brian@zim.(none)
7234f79c4a
This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break).
2006-02-25 18:03:11 -08:00
msvensson@neptunus.(none)
7d29ace754
Bug #17443 mysqldump test failure
2006-02-24 17:10:40 +01:00
kent@mysql.com
5484ee5815
Makefile.am:
...
Conditionally link with libmysqlclient.la or libmysqlclient_r.la
configure.in:
Corrected help text for --with-debug option
Changed default to be with thread safe client
Added THREAD_SAFE_CLIENT to be used in 'if' in make files
2006-02-24 01:24:41 +01:00
paul@snake-hub.snake.net
082e9ddbe3
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-23 13:56:00 -06:00
paul@snake-hub.snake.net
b11c033f49
mysqltest.c:
...
Rearrange out of order options in option struct.
2006-02-23 13:54:55 -06:00
msvensson@neptunus.(none)
f824345be6
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 16:11:47 +01:00
msvensson@neptunus.(none)
36a1d6392b
Change snprintf to my_snprintf
2006-02-23 16:08:28 +01:00
msvensson@neptunus.(none)
167b625e62
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 14:35:57 +01:00
msvensson@neptunus.(none)
269ab365aa
Aix52 build fix
2006-02-23 14:06:29 +01:00
msvensson@neptunus.(none)
3ece1f3eda
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:54:56 +01:00
msvensson@neptunus.(none)
8d78cd3e3c
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-23 10:41:37 +01:00
msvensson@neptunus.(none)
5c4bf37259
Merge fixup
2006-02-23 10:35:53 +01:00
msvensson@neptunus.(none)
f80555880a
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f
Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched.
2006-02-23 10:11:57 +01:00
knielsen@mysql.com
da6e7e172f
Merge mysqldev@win2003-x86:my/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmpbuild-5.1
2006-02-22 10:19:45 +01:00
msvensson@neptunus.(none)
d35ba92a24
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 15:57:56 +01:00
msvensson@neptunus.(none)
a699a2ea1b
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 15:05:58 +01:00
msvensson@neptunus.(none)
f64effb570
Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871
...
into neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
2006-02-21 15:03:15 +01:00
msvensson@neptunus.(none)
c293324eb0
Bug#14871 mysqldump: invalid view dump output
...
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
2006-02-21 13:21:17 +01:00
msvensson@neptunus.(none)
8e760bc6cc
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
751d625865
Merge neptunus.(none):/home/msvensson/mysql/bug17382/my51-bug17382
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 09:28:36 +01:00
msvensson@neptunus.(none)
8e9d535676
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-21 09:11:59 +01:00
msvensson@neptunus.(none)
6006c9ac36
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 09:11:03 +01:00
msvensson@neptunus.(none)
3d1f99f8f9
Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809
...
into neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
2006-02-21 09:09:54 +01:00
msvensson@neptunus.(none)
3764d3dab1
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:55:13 +01:00
msvensson@neptunus.(none)
ac336241b3
Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795
...
into neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
2006-02-21 08:54:08 +01:00
msvensson@neptunus.(none)
40fca5ca11
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-20 15:06:18 +01:00
msvensson@neptunus.(none)
6a8be78acc
Merge fix
2006-02-20 15:05:23 +01:00
msvensson@neptunus.(none)
4cde1d1259
Bug#17382 mysql-test-run mysqldump fails with mysqlimport
2006-02-20 13:04:40 +01:00
msvensson@neptunus.(none)
ae174fbef8
Fix typo
2006-02-20 12:05:45 +01:00
kent@mysql.com
2f3811b50c
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-02-20 00:36:40 +01:00
kent@mysql.com
0120bac7f6
mysql-test-run.pl:
...
Added --restart-cleanup option
drop-on-restart.inc:
DROP commands to cleanup on restart
new file
mysqltest.c:
Added option --include=<sql-file>
2006-02-20 00:32:07 +01:00
kent@mysql.com
4c81413932
Merge
2006-02-19 23:47:00 +01:00
brian@zim.tangent.org
faa1b42989
Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well).
2006-02-19 09:41:59 -08:00
msvensson@neptunus.(none)
e592227529
Fix build failure
2006-02-18 16:18:51 +01:00
kent@mysql.com
a50023d772
mysqlimport.c:
...
Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
Changed __WIN32__ to __WIN__
dbug.c:
Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
Copy plugin directory recursively
dbug.vcproj:
Define __WIN__ for all targets
2006-02-18 08:46:18 +01:00
kent@mysql.com
9aca849da1
Makefile.am:
...
Add an extra -lpthread before first -lc, to solve link
problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
Added copying of the include/mysql directory
2006-02-18 04:23:24 +01:00
msvensson@neptunus.(none)
ace6f14267
Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory
...
- Disable --use-threads option in 5.1.7
2006-02-17 18:19:29 +01:00
msvensson@neptunus.(none)
a50d87da34
Fix after review
2006-02-17 17:16:18 +01:00
msvensson@neptunus.(none)
7632371576
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-17 15:56:01 +01:00
msvensson@neptunus.(none)
e96353cf55
Bug#17382 mysql-test-run mysqldump fails with mysqlimport
...
- Remove global MYSQL connection variable
2006-02-17 15:52:05 +01:00
paul@snake-hub.snake.net
3a9bfb00c8
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
...
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-17 08:33:47 -06:00
paul@snake-hub.snake.net
22f630f59a
mysqlcheck.c:
...
Tweak --check-upgrade help text.
2006-02-17 08:32:52 -06:00
msvensson@neptunus.(none)
01cd7a05c7
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
2006-02-17 12:16:36 +01:00
msvensson@neptunus.(none)
b951068d62
Replace win filename s with unix equivalent
...
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
2006-02-17 12:07:45 +01:00
holyfoot@mysql.com
0841480e1e
merging
2006-02-17 14:39:38 +04:00