mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36755 commits 2781 branches 343 tags 1.6 GiB
Commit graph

2024 commits

Author SHA1 Message Date
monty@mysql.com/narttu.mysql.fi
e5cc397f33 Fixed compiler warnings (for linux and win32 and win64) 
Fixed a couple of usage of not initialized warnings (unlikely cases)
 2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2007-02-21 14:07:08 +02:00
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
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
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
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
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
00ee20edaa Add echo.c as EXTRA_DIST file 2007-02-19 13:21:06 +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
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
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
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
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
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
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
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
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
tsmith@siva.hindu.god
6fd02a439f Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
 2007-01-18 09:53:30 -07:00
iggy@recycle.(none)
294af0a42e Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/mysql-5.0-maint
 2007-01-18 11:46:29 -05:00
iggy@recycle.(none)
ef5f757ac2 Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces 
- Create space safe strings for system() calls in mysql_upgrade.exe
 2007-01-18 11:38:05 -05:00
msvensson@neptunus.(none)
77b0123882 Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-16 17:53:45 +01:00
msvensson@neptunus.(none)
ae03f5d382 Don't reuse prepared statements if running with reconnect enabled 2007-01-16 17:47:41 +01:00
msvensson@neptunus.(none)
11ddeb693d Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-16 14:13:48 +01:00
msvensson@neptunus.(none)
f507bb2cb3 Bug#15518 Reusing a stmt that has failed during prepare does not clear error 
- Always reset error when calling mysql_stmt_prepare a second time
 - Set stmt->state to MYSQL_STMT_INIT_DONE before closing prepared stmt in server.
 - Add test to mysql_client_test
 - Remove mysql_stmt_close in mysqltest after each query
 - Close all open statements in mysqltest if disable_ps_protocol is called.
 2007-01-16 13:39:42 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
c380de50ef Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-01-12 12:22:54 +01:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-01-11 09:43:44 -05:00
kent@mysql.com/kent-amd64.(none)
21c7eca2bf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-01-01 05:35:10 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s: 
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
 2006-12-31 01:02:27 +01:00
joerg@trift2.
cb5e2b3004 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-12-28 18:22:43 +01:00
tsmith/tim@siva.hindu.god
682596d7ce Merge siva.hindu.god:/usr/home/tim/m/bk/g50 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-26 22:28:28 -07:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files: 
Changed header to GPL version 2 only
 2006-12-23 20:17:15 +01:00
df@kahlann.erinye.com
dc33e0f49d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-24896 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
 2006-12-20 10:40:05 +01:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0 Fixed compiler warnings detected by option -Wshadow and -Wunused: 
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
 2006-12-15 00:51:37 +02:00
df@kahlann.erinye.com
b9cce096a2 BUG#24896 magnus' suggestion 2006-12-12 15:47:02 +01:00
msvensson@neptunus.(none)
b880d8aa05 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-11 17:04:14 +01:00
msvensson@neptunus.(none)
8a7ea3c744 Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite 
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
  mysqltest
 2006-12-11 15:39:15 +01:00
msvensson@neptunus.(none)
4e34f77c85 Bug#23735 mysqlbinlog client fails when reading binlog from stdin 
- Windows opens stdin in text mode by default. Certain characters
   such as CTRL-Z are interpeted as events and the read() method
   will stop. CTRL-Z is the EOF marker in Windows. to get past this
   you have to open stdin in binary mode. Setmode() is used to set
   stdin in binary mode. Errors on setting this mode result in
   halting the function and printing an error message to stderr.
 2006-12-11 11:25:45 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3 Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-12-08 23:33:39 +01:00
lars@mysql.com/black.(none)
587330f125 Merge mysql.com:/home/bkroot/mysql-4.1-rpl 
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
 2006-12-08 23:33:15 +01:00
msvensson@neptunus.(none)
3a4491c70a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-08 16:50:54 +01:00
msvensson@neptunus.(none)
3e43b86329 Add missing space 2006-12-08 16:48:49 +01:00
msvensson@neptunus.(none)
9064723d1b Bug#19410 Test 'kill' fails on Windows + SCO 
- Use "mysql_field_count" to determine if there is a need to
   call "mysql_store_result"
 2006-12-08 16:43:50 +01:00
msvensson@neptunus.(none)
40927c0cb2 Bug#24498 Stack overflow in mysqltest 
- Thanks to Vasil Dimov for the patch!
 2006-12-08 16:08:54 +01:00
rafal@quant.(none)
fe2d5c59c2 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl 
into  quant.(none):/ext/mysql/bk/mysql-5.0-bug24507
 2006-12-08 11:47:48 +01:00
df@kahlann.erinye.com
8375e6684d BUG#24896 mysql_upgrade -p fix 2006-12-08 10:23:03 +01:00
msvensson@neptunus.(none)
94eb027f6b Only call mysql_server_end if mysql_server_init has been called. 
Remove DBUG_ENTER in my_end
 2006-12-06 23:43:36 +01:00
msvensson@neptunus.(none)
6d71f74743 Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883 2006-12-05 18:46:08 +01:00
msvensson@neptunus.(none)
2f79d20bc3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:36:53 +01:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
544d0c909b mysqltest 
Close any statements that might be open before program exit
Close any statments that might be open when calling "disable_ps_protocol"
 2006-12-04 19:16:55 +01:00
msvensson@neptunus.(none)
33c248eee5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-04 19:06:42 +01:00
msvensson@neptunus.(none)
c2488ba10f Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connection to MySQL 
- Add CR_CONN_HOST_ERROR to list of errorcode that trigger another connection
   attempt in mysqltest
 2006-12-04 15:48:34 +01:00
df@kahlann.erinye.com
da7820c37d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-01 13:02:54 +01:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a Fixed compiler warnings 
Don't assert if my_thread_end() is called twice (common case)
 2006-11-30 21:56:03 +02:00
monty@mysql.com/narttu.mysql.fi
3d40956039 Fixed portability issue in my_thr_init.c (was added in my last push) 
Fixed compiler warnings (detected by VC++):
- Removed not used variables
- Added casts
- Fixed wrong assignments to bool
- Fixed wrong calls with bool arguments
- Added missing argument to store(longlong), which caused wrong store method to be called.
 2006-11-30 18:25:05 +02:00
msvensson@neptunus.(none)
f883d68ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 10:57:40 +01:00
msvensson@neptunus.(none)
a743e17d8c Add "chmod" command to mysqltest 2006-11-30 10:54:50 +01:00
msvensson@neptunus.(none)
d3090cc3fe Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-29 23:08:35 +01:00
msvensson@neptunus.(none)
db863d826c Add command "chmod" to mysqltest 2006-11-29 23:02:06 +01:00
gkodinov@dl145s.mysql.com
43c3dfeb27 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
 2006-11-29 11:25:22 +01:00
holyfoot/hf@mysql.com/deer.(none)
0434b70f3a Merge mysql.com:/home/hf/work/thfix/my41-thfix 
into  mysql.com:/home/hf/work/thfix/my50-thfix
 2006-11-29 09:24:35 +04:00
holyfoot/hf@mysql.com/deer.(none)
0b614d0025 fixed compilation failure on hpux 
the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.
 2006-11-29 09:23:54 +04:00
msvensson@neptunus.(none)
cc747a02b3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 21:11:05 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
a70028a855 Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 
Problem: when loading mysqlbinlog dumps, CREATE PROCEDURE having semicolons
in their bodies failed.
Fix: Using safe delimiter "/*!*/;" to dump log entries.
 2006-11-28 16:26:15 +04:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.0-merge
 2006-11-27 21:45:16 +01:00
jpipes@shakedown.(none)
03a5dcd7ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  shakedown.(none):/home/jpipes/dev/mysql-5.0-maint
 2006-11-27 14:58:57 -05:00
gkodinov@dl145s.mysql.com
e74c9add47 Merge bk-internal:/home/bk/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-27 16:25:52 +01:00
msvensson@neptunus.(none)
c4af2f26a7 Add mysys/my_getpagesize.c as source file for mysql_upgrade 2006-11-23 21:07:41 +01:00
monty@mysql.com/nosik.monty.fi
fb9bb62b1e Added some missing DBUG_RETURN 
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
 2006-11-23 16:41:21 +02:00
msvensson@neptunus.(none)
c76adf6021 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
176313a679 mysql_upgrade should look for .sql script also in share/ directory 2006-11-23 11:56:05 +01:00
msvensson@neptunus.(none)
2aa0d085e3 Build fixes for NetWare 2006-11-23 11:38:44 +01:00
iggy@rolltop.ignatz42.dyndns.org
bface97ecc Bug#19799 delimiter command not working correctly when sourcing a sql file 
- Client side readline functions unconditionally search for Unix '\n' line
endings. In this case, the delimiter statement was set to '//\r' instead 
of the intended '//'. When removing the '\n' check for and remove 
preceeding '\r' character as well.
 2006-11-21 21:10:02 -05:00
msvensson@neptunus.(none)
f25590d8b7 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-21 16:50:40 +01:00
msvensson@neptunus.(none)
fe0fc2d637 Merge 192.168.0.4:mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-21 16:42:07 +01:00
msvensson@neptunus.(none)
9594462f72 Remove unused variable 2006-11-21 16:34:10 +01:00
msvensson@shellback.(none)
a9eb1b709a Add missing semicolon 2006-11-21 09:36:29 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
fb419c4241 BUG#13926: --order-by-primary fails if PKEY contains quote character. 
Backporting from 5.0
 2006-11-21 11:09:33 +04:00
msvensson@shellback.(none)
fc144204da Port mysql_upgrade to be tested on windows 2006-11-21 00:46:13 +01:00
msvensson@shellback.(none)
4dc0aeb7b6 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-20 23:38:22 +01:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
msvensson@shellback.(none)
3b57cf0f74 Fix mysqltest to automatically replace \ with / also in 
$MYSQLTEST_VARDIR, for usage of vardir=e:/var<nnn> on windows
 2006-11-20 21:03:40 +01:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
 2006-11-17 10:30:16 +04:00
holyfoot/hf@mysql.com/deer.(none)
497ccd6b87 Merge mysql.com:/home/hf/work/mysql-4.1-mrg 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-11-16 23:16:44 +04:00
holyfoot/hf@mysql.com/deer.(none)
2963d8ddd2 merging 2006-11-16 21:23:34 +04:00
holyfoot/hf@mysql.com/deer.(none)
db5db841a9 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1-mrg
 2006-11-16 20:44:37 +04:00
msvensson@neptunus.(none)
f105e0ecd0 Merge neptunus.(none):/home/msvensson/mysql/bug19817/my50-bug19817 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 17:51:33 +01:00
msvensson@neptunus.(none)
bf020e5ea6 Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libs 
- Most likely caused by linking with libmysqlclient using gcc and not g++.
 - Removing our "yassl_dummy_link_fix" hacks so some test programs are linked
   with gcc 
 - Remove build of non working test programs in vio
 2006-11-13 17:16:37 +01:00
msvensson@neptunus.(none)
bf8a9e544c Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 16:39:44 +01:00
msvensson@neptunus.(none)
5110d91ec3 Make it possible for .test suites to run "mysql_upgrade" 
Add new test file mysql_upgrade.test
 2006-11-13 13:39:49 +01:00
ted@ted.mysql.internal
bc9ca699fb Memory allocation bug fixed 2006-11-10 07:21:10 +03:00
msvensson@neptunus.(none)
f032a223b7 Fix warnings and NetWare compile failure 2006-11-09 00:17:22 +01:00
msvensson@neptunus.(none)
0ec6432636 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 23:24:16 +01:00
msvensson@neptunus.(none)
4dfbc712ed Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-08 22:54:22 +01:00
msvensson@neptunus.(none)
1437500c1b Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 2006-11-08 22:53:40 +01:00
ted@ted.mysql.internal
3e6735e277 BUG#20100 fix: mysql_upgrade modified to also accept all 
the communication parameters from the command line
and pass 'em correctly to both mysqlcheck and mysql
 2006-11-08 05:45:50 +03:00
msvensson@neptunus.(none)
fa79d0fccb Fix DBUG_PRINT in mysqltest, the real value to print is in ds_cmd 2006-11-03 16:06:13 +01:00
msvensson@shellback.(none)
15835edddd Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-02 23:09:32 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9658dc9127 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
 2006-11-02 16:25:01 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
82ec5bd111 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
 2006-11-02 16:20:52 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9361705934 Merge mysql.com:/usr/home/ram/work/bug22913/my41-bug22913 
into  mysql.com:/usr/home/ram/work/bug22913/my50-bug22913
 2006-11-02 14:33:22 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a072688eea Fix for bug #22913: mysql --quick doesn't report some errors. 
We don't check for errors that may occur during data printing.
 2006-11-02 14:32:00 +04:00
msvensson@shellback.(none)
b9d4ccbf18 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-31 19:08:30 +01:00
msvensson@shellback.(none)
64eb65533e Make variables static to please Netware compiler 2006-10-31 18:51:23 +01:00
msvensson@neptunus.(none)
74a29e5db4 Bug#20894 Reproducible MySQL client segmentation fault 
- Add two null bytes in  "buff" variable allowing us to call
   get_arg two times also for strings longer than sizeof(buff)
 2006-10-26 19:51:29 +02:00
msvensson@neptunus.(none)
ccc33b4e53 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 16:00:42 +02:00
msvensson@neptunus.(none)
26183402d1 Use same type for local variables as arguments, avoid compile error on NetWare 2006-10-24 13:52:50 +02:00
msvensson@neptunus.(none)
c972edc663 Enable the ATTRIBUTE_FORMAT macros to check format of variable arg parameters 2006-10-24 13:34:10 +02:00
holyfoot/hf@mysql.com/deer.(none)
97df0fce16 WL#3475 merging 2006-10-24 15:28:16 +05:00
holyfoot/hf@mysql.com/deer.(none)
836e159ff3 merging fix 2006-10-24 12:35:32 +05:00
holyfoot/hf@mysql.com/deer.(none)
cd5684543c Merge mysql.com:/home/hf/work/w3475/my41-w3475 
into  mysql.com:/home/hf/work/w3475/my50-w3475
 2006-10-23 16:50:01 +05:00
holyfoot/hf@mysql.com/deer.(none)
4d23559806 WL#3475 (Threads for the embedded server in mysqltest) 
Necessary code added to mysqltest.c.
Disabled tests are available now.
 2006-10-23 15:02:51 +05:00
msvensson@neptunus.(none)
c7710510ac Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 17:15:49 +02:00
msvensson@neptunus.(none)
9a5b4a1151 Add command "exit" to mysqltest, it will stop processing any more 
commands and go directly to result file processing
 2006-10-19 13:34:09 +02:00
msvensson@neptunus.(none)
b11dee73ca Backport test cases fixes from 5.0 2006-10-19 10:54:23 +02:00
iggy@rolltop.ignatz42.dyndns.org
39bda9e3cf Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-10-18 19:27:14 -04:00
iggy@rolltop.ignatz42.dyndns.org
3c31c84200 Bug#19745: mysqldump --xml produces invalid xml 
The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.  
The proper XML datatype is xs:hexBinary.  
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.
 2006-10-18 18:43:51 -04:00
msvensson@shellback.(none)
ffc9538bb4 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-14 19:55:06 +02:00
msvensson@shellback.(none)
a9e60bab29 Use char as datatype for the byte that are read with my_fgetc, fixes problem with 
mysqltest.test on Solaris and Mac. write_file produced nice files with all zeroes.
 2006-10-14 17:09:06 +02:00
msvensson@shellback.(none)
d8b9f7cb0e Improving debugging support in 'read_line' function 2006-10-14 17:02:43 +02:00
msvensson@shellback.(none)
de3f217e10 Use 'my_strnncoll_simple' instead of 'strncasecmp' 2006-10-13 11:38:32 +02:00
msvensson@shellback.(none)
889e7147f6 Add ATTRIBUTE_FORMAT specifier to _db_doprnt, which is used by DBUG_PRINT 
This will hopefully avoiid annoying crashes when running with --debug
Fix warnings  from the above in mysqltest.c
 2006-10-12 20:15:56 +02:00
msvensson@shellback.(none)
1be01ceea8 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-12 18:48:03 +02:00
msvensson@shellback.(none)
1b06c7c78e Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new
 2006-10-12 17:37:59 +02:00
msvensson@shellback.(none)
925220627c Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 13:51:54 +02:00
msvensson@shellback.(none)
6c31690bbd Move the reconnect variable to beginning of function 
Fix warning about value from "*ptr++" not being used. Changed it to ptr++
 2006-10-12 13:50:50 +02:00
msvensson@shellback.(none)
5741683d12 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 11:30:07 +02:00
msvensson@shellback.(none)
71cb0e8dc5 Only print cur_file->filename if cur_file->file is set 
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
 2006-10-12 10:49:59 +02:00
msvensson@shellback.(none)
0eb2fff749 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 21:56:09 +02:00
msvensson@shellback.(none)
5b8312986c Fixes for embedded server test 2006-10-11 21:53:43 +02:00
msvensson@shellback.(none)
eb6cb97a4d Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 11:39:08 +02:00
msvensson@shellback.(none)
f807b6e893 Fix some bad code in mysqltest.c which cause segfault 2006-10-11 11:21:44 +02:00
cmiller@zippy.cornsilk.net
6a870d4cfc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
 2006-10-09 18:54:48 -04:00
cmiller@zippy.cornsilk.net
0ab343a7dc Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
 2006-10-09 18:53:17 -04:00
cmiller@zippy.cornsilk.net
4d0023edf6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
 2006-10-09 18:46:28 -04:00
cmiller@zippy.cornsilk.net
4812d81eab Bug#17583: mysql drops connection when stdout is not writable 
When the client program had its stdout file descriptor closed by the calling
shell, after some amount of work (enough to fill a socket buffer) the server 
would complain about a packet error and then disconnect the client.

This is a serious security problem.  If stdout is closed before the mysql is
exec()d, then the first socket() call allocates file number 1 to communicate
with the server.  Subsequent write()s to that file number (as when printing
results that come back from the database) go back to the server instead in 
the command channel.  So, one should be able to craft data which, upon being
selected back from the server to the client, and injected into the command
stream become valid MySQL protocol to do something nasty when sent /back/ to 
the server.

The solution is to close explicitly the file descriptor that we *printf() to, 
so that the libc layer and the OS layer both agree that the file is closed.
 2006-10-09 18:28:06 -04:00