Commit graph

21836 commits

Author SHA1 Message Date
unknown
b40ef082c8 MySQL versions before 5.0 still use cygwin, no need
to convert path
2007-03-01 11:41:29 +01:00
unknown
acdfc1e9fe Merge pilot.blaudden:/home/msvensson/mysql/bug24878/my41-bug24878
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-28 16:38:31 +01:00
unknown
87eee8fcad Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages
- Add printout of current time when mysqld is killed by an
   unhandled signal


sql/mysqld.cc:
  Add printout of current time before the "mysqld got signal %d" message
  Hopefully we don't crash in the calls to 'time' or 'localtime_r'
  but if that should start to happen we can move the printout of
  time further down. At least it's now below the check for segfault
  inside of segfault handler.
2007-02-28 16:37:50 +01:00
unknown
22cac737ca Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Build lib/init-db.sql from the output of mysql_create_system_tables
 - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
 - Leave netware/init_db.sql until 5.0 where we should soon have possibility
   to test with mysql-test-run.pl


BitKeeper/deleted/.del-init_db.sql:
  Delete: mysql-test/init_db.sql
BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8:
  Delete: mysql-test/lib/init_db.sql
BitKeeper/etc/ignore:
  Added mysql-test/lib/init_db.sql to the ignore list
mysql-test/Makefile.am:
  Build lib/init_db.sql from the output of mysql_create_system_tables
2007-02-28 15:03:47 +01:00
unknown
7624028419 When using a --mem=<dir> the memdir must be removed to assure
afresh start
2007-02-28 13:47:41 +01:00
unknown
4d49015bf9 Bug#26416 mysql-test-run exits with "Hangup" when piped to grep
- Thanks to Christian for the patch!


mysql-test/lib/mtr_process.pl:
  Avoid printout of "Hangup" when script exits by using
  POSIX::kill
2007-02-28 10:52:51 +01:00
unknown
e40bcac08e Bug#26686 mysql-test-run.pl aborts when waitpid returns -1
- Add error handling for waitpid returns -1 for "simple run of command"


mysql-test/lib/mtr_process.pl:
  - Add error handling for waitpid returns -1
  when a simple command is run.
  - Add missing return
  - Add mtr_errors where the program should never come 
  - Remove an else to improve program readability
  - Change mtr_debug to mtr_warning for "Got EAGAIN from fork()..."
2007-02-28 10:37:32 +01:00
unknown
64278d4fc9 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint-without-cygwin
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
2007-02-28 10:06:21 +01:00
unknown
8c5a862569 Use cygwin for --exec and --system in mysqltest for MySQL before 5.0 2007-02-28 10:05:51 +01:00
unknown
d59d5f18c4 Bug#19410 Test 'kill' fails on Windows + SCO
- Use "mysql_stmt_field_count" to determine if there is a need to
call "mysql_stmt_store_result"


client/mysqltest.c:
  Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is
  greater than 0 indicating that this query has a result set.
  This change is mainly since if mysql_stmt_store_result fails
  the value returned by mysql_stmt_field_count will be reset.
2007-02-28 09:10:38 +01:00
unknown
e7d8bde1da Only allow a version number to be read from "/etc/debian_version" 2007-02-26 14:52:51 +01:00
unknown
f10cfb055a Add "diff_files" command to mysqltest 2007-02-20 18:20:58 +01:00
unknown
1009e0d304 New version of 'do_cat_file' that will trim cr/lf to lf 2007-02-20 14:20:49 +01:00
unknown
ca99440907 Turn the "is_windows" flag _on_ when compiled on windows 2007-02-19 20:34:12 +01:00
unknown
a8be1b9325 Commment out two test's thats just confusing for cmd.exe 2007-02-19 18:23:59 +01:00
unknown
8d7e8d9715 Add cat_file command to mysqltest 2007-02-19 18:19:47 +01:00
unknown
d329b1f203 Add "append_file" command to mysqltest 2007-02-19 16:39:50 +01:00
unknown
da21afb219 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
unknown
c6e1de4c56 Merge 192.168.0.10:mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint


client/mysqltest.c:
  Auto merged
2007-02-16 15:23:06 +01:00
unknown
a843a05f92 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 ..." 


client/mysqltest.c:
  Workaround the problem with "echo" in windows not behaving like "echo" in Unix.
  - Replace "--exec echo ..." with "--exec <path to mysqltest>\echo.exe" thus forcing
    use of our own echo implementation which baheves like on Unix.
  - The above change makes it possible to remove the need to execute all --exec's
    inside cygwin. Add ifdefs to only use use cygwin's bash conditionally
mysql-test/lib/mtr_misc.pl:
  Add function for converting to the OS's native format
mysql-test/mysql-test-run.pl:
  Convert path to executables to "windows native" (c:\<path>\) instead of "mixed"(c:/<path>) mode
  necessary for pipes and redirects to work properly in cmd.exe
client/echo.c:
  New BitKeeper file ``client/echo.c''
2007-02-16 15:19:38 +01:00
unknown
4ff5ff2c0b Merge 192.168.0.10:mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-15 15:56:05 +01:00
unknown
7560dbd233 Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2007-02-15 15:04:53 +01:00
unknown
5097c6fc06 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126
into  calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint


sql/item.cc:
  Auto merged
mysql-test/r/order_by.result:
  Manual merge.
mysql-test/t/order_by.test:
  Manual merge.
2007-02-14 12:24:11 -05:00
unknown
557f6169b9 Use my_vsnprintf instead of vsnprintf 2007-02-14 16:49:41 +01:00
unknown
af1f49b77e Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into  bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
2007-02-13 21:25:22 +01:00
unknown
77ec64a33f Write some debug info to result log file before dying in 'do_exec' 2007-02-13 18:59:46 +01:00
unknown
089ce4e3cc Reset value of variable "escaped" in "default" label causing $variables not
to be expanded in same cases 


client/mysqltest.c:
  Reset value of variable "escaped" in "default" label
2007-02-13 16:59:58 +01:00
unknown
82e677b947 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2007-02-13 10:54:04 -05:00
unknown
38fa86a12e Merge bk@192.168.21.1:mysql-4.1-opt
into  mysql.com:/home/hf/work/25492/my41-25492
2007-02-13 01:18:52 +04:00
unknown
fd76e14893 bug #25492 (Invalid deallocation in mysql_stmt_fetch)
libmysqld/lib_sql.cc:
  code modified to prevent freeing of memory that wasn't malloc-ed.
  Now we check if MYSQL_STMT::result was used.
2007-02-13 00:55:45 +04:00
unknown
8a34c4bb78 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/home/tnurnberg/24660/41-24660


sql/table.cc:
  Auto merged
2007-02-12 14:39:45 +01:00
unknown
4dc7c1aa46 Bug#24660: "enum" field type definition problem
ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used. Now if 0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an error.

Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.


mysql-test/r/type_enum.result:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
mysql-test/t/type_enum.test:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
sql/table.cc:
  Bug#24660: "enum" field type definition problem
  
  Revert fix for Bug#20922.
sql/unireg.cc:
  Bug#24660: "enum" field type definition problem
  
  Use a field-separator for ENUM-values that is not part of those values. If impossible,
  throw error.
2007-02-12 14:31:44 +01:00
unknown
4c4f506238 Bug#25126: Reference to non-existant column in UPDATE...ORDER BY... crashes server
"update existingtable set anycolumn=nonexisting order by nonexisting" would crash
the server.

Though we would find the reference to a field, that doesn't mean we can then use
it to set some values.  It could be a reference to another field.  If it is NULL, 
don't try to use it to set values in the Item_field and instead return an error.

Over the previous patch, this signals an error at the location of the error, rather
than letting the subsequent deref signal it.


mysql-test/r/order_by.result:
  Verify that all permutations work.
mysql-test/t/order_by.test:
  Verify that all permutations work.
sql/item.cc:
  When the field is NULL, don't dereference it when we set_field().  
  Instead, raise an error.
2007-02-09 11:05:36 +01:00
unknown
43ada21fe1 Merge siva.hindu.god:/home/tsmith/m/bk/41
into  siva.hindu.god:/home/tsmith/m/bk/maint/41


sql/sql_prepare.cc:
  Manual merge
2007-02-08 16:01:13 -07:00
unknown
7c08621c5a Merge mysql.com:/home/gluh/MySQL/Merge/4.1
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt


sql/item_func.cc:
  Auto merged
2007-02-08 14:54:49 +04:00
unknown
75d614e053 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb
2007-02-08 00:25:30 +07:00
unknown
772e03c225 Bug#10777 ERROR File = sql_lex.cc, Line = 93 The identifier "symbols" is undefined.
- Protect againt empty/corrupt lex_hash-h by writing output from gen_lex_hash to 
   a temporary file first.


sql/Makefile.am:
  Protect against empty lex_hash.h due to failed execution of
  gen_lex_hash by writing outpout to a tmp file first
2007-02-07 09:46:20 +01:00
unknown
0554802f3c Merge 192.168.0.10:mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 23:01:01 +01:00
unknown
665d9e30fb Bug#25344 Segmentation violation when try to run the perror utility
- strerror might return NULL on some platforms


extra/perror.c:
  Backport fix from 5.0
2007-02-06 23:00:18 +01:00
unknown
31aee856d8 Merge 192.168.0.10:mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


mysys/default.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
2007-02-06 14:44:05 +01:00
unknown
b93d81a8d1 Merge neptunus.(none):/home/msvensson/mysql/my41-nmj
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint


sql/sql_prepare.cc:
  Auto merged
2007-02-06 14:42:40 +01:00
unknown
4660f6d5ef Merge bk-internal:/home/bk/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:27:43 +01:00
unknown
f58351c158 Merge 192.168.0.10:mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


sql/sql_prepare.cc:
  Auto merged
2007-02-06 14:27:00 +01:00
unknown
1d2d9a033d Bug#8983 one place that isn't strict-aliasing-safe
- Backport fix from 5.0


sql/sql_prepare.cc:
  Avoid problems with -no-strict-aliasing in gcc 4.0+
2007-02-06 14:07:40 +01:00
unknown
70323365c1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug23938/my41-bug23938


sql/item_timefunc.cc:
  Auto merged
2007-02-06 14:58:07 +04:00
unknown
9946ed16f3 Test and bug fixes and removed unneccessary files.
mysys/my_getopt.c:
  Fixes problem with getting output lines from
  my_getopt in random places in tests.
sql/sql_prepare.cc:
  Fixes problem with failing mysql_client_test
  on some machines. This is actually a problem
  with prepared statements.
2007-02-05 17:09:44 +02:00
unknown
30edb3cd0f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798


sql/slave.cc:
  Auto merged
2007-02-05 10:20:47 +04:00
unknown
0dc19dadb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-02 20:23:03 +01:00
unknown
98b9ac693a After merge fix 2007-02-02 20:19:13 +01:00
unknown
04cbadde7a another valgrind error fix for 4.1(backport from 5.0) 2007-02-02 17:18:42 +04:00