Commit graph

1691 commits

Author SHA1 Message Date
pem@mysql.com
a065843799 Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-06 19:46:17 +01:00
dlenev@mysql.com
0fb4a6645e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
2006-03-04 23:58:48 +03:00
cmiller@zippy.(none)
599c710a5b Bug#16859 involves truncating column data at NUL characters. Instead, the
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
2006-03-03 16:26:38 -05:00
paul@snake-hub.snake.net
53ea1584bc Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1-clone
2006-03-03 14:41:55 -06:00
paul@snake-hub.snake.net
1442be9798 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
2006-03-03 14:37:43 -06:00
paul@snake-hub.snake.net
f3cf52832d mysqltest.c:
Typos.
2006-03-03 14:34:30 -06:00
paul@snake-hub.snake.net
f3c7e2d3ed mysqltest.c:
Better fix for do_sleep().
2006-03-03 13:57:49 -06:00
serg@serg.mylan
c7513d18db crazy - for the last week mysqlslap.test was generating 400 sigsegvs
per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".
2006-03-02 10:48:54 +01:00
kent@mysql.com
bc5c186828 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-03-01 03:18:59 +01:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
paul@snake-hub.snake.net
1986796849 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-28 15:14:31 -06:00
paul@snake-hub.snake.net
67e4580e29 mysqltest.c:
expand tab
2006-02-28 15:11:44 -06:00
paul@snake-hub.snake.net
d8a6e41c6b Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb mysql-test-run.sh:
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
49de5254f3 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-28 14:05:20 -06:00
paul@snake-hub.snake.net
7ff2ede8c9 mysqltest.c:
Fix reference to incorrect (non-existent) options in comment.
2006-02-28 14:04:21 -06:00
paul@snake-hub.snake.net
486bd42b06 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 14:01:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4 mysqltest.c:
Correct/clarify comments.
2006-02-28 14:00:17 -06:00
paul@snake-hub.snake.net
c28c6aa953 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-28 12:20:48 -06:00
paul@snake-hub.snake.net
a052ef7d82 mysqltest.c:
Fix typos.
2006-02-28 12:19:30 -06:00
paul@snake-hub.snake.net
a2c639d813 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-28 12:10:38 -06:00
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