Commit graph

2450 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
dd74beb6be Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-20 18:21:14 +01:00
msvensson@pilot.blaudden
d6584a920b Add "diff_files" command to mysqltest 2007-02-20 18:20:58 +01:00
msvensson@pilot.blaudden
c796468004 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-20 14:24:01 +01:00
msvensson@pilot.blaudden
c7d138cfa3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-20 14:21:11 +01:00
msvensson@pilot.blaudden
26432d16e8 New version of 'do_cat_file' that will trim cr/lf to lf 2007-02-20 14:20:49 +01:00
msvensson@pilot.blaudden
2d819535c7 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 20:34:52 +01:00
msvensson@pilot.blaudden
269d9daf0d Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 20:34:29 +01:00
msvensson@pilot.blaudden
86f6955701 Turn the "is_windows" flag _on_ when compiled on windows 2007-02-19 20:34:12 +01:00
msvensson@pilot.blaudden
9aeb8297b5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 18:25:10 +01:00
msvensson@pilot.blaudden
420bf2a398 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 18:20:33 +01:00
msvensson@pilot.blaudden
cb84744145 Add cat_file command to mysqltest 2007-02-19 18:19:47 +01:00
msvensson@pilot.blaudden
f65cb65d23 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 16:42:54 +01:00
msvensson@pilot.blaudden
91967e5550 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 16:40:11 +01:00
msvensson@pilot.blaudden
d2c02cd10d Add "append_file" command to mysqltest 2007-02-19 16:39:50 +01:00
msvensson@pilot.blaudden
3de9813e10 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 13:22:18 +01:00
msvensson@pilot.blaudden
00ee20edaa Add echo.c as EXTRA_DIST file 2007-02-19 13:21:06 +01:00
msvensson@pilot.blaudden
c122f59c0c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-19 12:05:13 +01:00
msvensson@pilot.blaudden
51f96e43c5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-19 12:04:21 +01:00
msvensson@pilot.blaudden
c2c4604580 Don't output escape char from 'do_eval' on windows. "It" won't
know it's an escape char.
Replace /dev/null with NUL
Replace "closed stdout" with "not open fd"
2007-02-19 12:00:17 +01:00
msvensson@pilot.blaudden
f6ab6506ba Add echo to be compiled 2007-02-16 15:33:54 +01:00
msvensson@pilot.blaudden
03b71c9209 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-16 15:32:51 +01:00
msvensson@pilot.blaudden
c1c7ba0aa0 Add echo.c to be built on Windows 2007-02-16 15:25:49 +01:00
msvensson@pilot.blaudden
b57994a7c2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-16 15:23:27 +01:00
msvensson@pilot.blaudden
dc6f9d5d1b Merge 192.168.0.10:mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-16 15:23:06 +01:00
msvensson@neptunus.(none)
8931166e55 Workaround for problem where cygwin's bash/sh randomly fails with error 128 which
mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
2007-02-16 15:19:38 +01:00
msvensson@pilot.mysql.com
07e9bebadf Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-14 16:51:04 +01:00
msvensson@pilot.mysql.com
c01c9b8899 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-14 16:50:15 +01:00
msvensson@pilot.mysql.com
9f720bb733 Use my_vsnprintf instead of vsnprintf 2007-02-14 16:49:41 +01:00
msvensson@pilot.mysql.com
a675fa54e3 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-13 19:01:00 +01:00
msvensson@pilot.mysql.com
2872fcfa42 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 19:00:04 +01:00
msvensson@pilot.mysql.com
410939b664 Write some debug info to result log file before dying in 'do_exec' 2007-02-13 18:59:46 +01:00
msvensson@pilot.mysql.com
ae3432f920 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-13 17:01:16 +01:00
msvensson@pilot.mysql.com
a1cd4ba68c Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 17:00:23 +01:00
msvensson@pilot.mysql.com
a0e3ca046b Reset value of variable "escaped" in "default" label causing $variables not
to be expanded in same cases
2007-02-13 16:59:58 +01:00
baker@bk-internal.mysql.com
a602d4a56e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-02-05 00:31:36 +01:00
brian@zim.(none)
08be7c3314 Fixed bug#26027
Just a bad copy/paste of help info
2007-02-04 15:31:35 -08:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
joerg@trift2.
9af6d01e3c Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-02-01 15:57:01 +01:00
joerg@trift2.
852321c7f8 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-01-31 18:20:23 +01:00
joerg@trift2.
e56eb2288c Fix bug#23293 "readline detection broken on NetBSD":
Its root cause is a difference between the "readline" and "libedit" (header files)
definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
This variable is used as a pointer to a function returning "char *",
but "libedit" declares it as returning "int" and then adds casts on usage.

Change it to "CPFunction *" and get rid of the casts.
2007-01-31 15:25:56 +01:00
brian@zim.(none)
9fc89facca Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached. 2007-01-29 13:17:30 -08:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
2007-01-29 01:47:35 +02:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
kaa@polly.local
4b36a96ed5 Merge polly.local:/tmp/maint/bug23814/my51-bug23814
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-01-19 14:29:18 +03:00
kaa@polly.local
71a292cac1 Fix for the bug #23814 "mysqlimport crashes"
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
2007-01-19 14:14:11 +03:00
tsmith@siva.hindu.god
1fbf01baf0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:34:51 -07:00
tsmith@siva.hindu.god
02ddf3d04c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:33:28 -07:00
tsmith@siva.hindu.god
6b729ff2cd Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00