Commit graph

8146 commits

Author SHA1 Message Date
unknown
d1c5ca31f6 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-19 23:11:16 +02:00
unknown
432a0f3683 less strict assert to take into account weird cases 2004-08-19 23:10:33 +02:00
unknown
03a20c23b3 ha_innodb.cc:
innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()


sql/ha_innodb.cc:
  innobase_mysql_tmpfile(): call dup() and my_close() on the file
  returned by create_temp_file()
  in order to avoid memory leak caused by my_open() being paired with close()
2004-08-19 23:22:16 +03:00
unknown
8c1af75515 Build bug on 64-Bit platforms.
Removed improper casts.
Thanks to Joerg Bruehe for the fix.


include/my_global.h:
  Build bug on 64-Bit platforms.
  Removed improper casts.
  Changed to uniform writing style.
  Appended 'L' to 32-Bit constants which doesn't hurt on 32-Bit,
  but can be important for some 64-Bit compilers.
2004-08-19 21:41:10 +02:00
unknown
f1cf7c13e0 typos fixed 2004-08-19 13:07:54 +02:00
unknown
283ebce11a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-19 12:00:03 +02:00
unknown
8001a7db2b take dec. point into account in store_double_in_string 2004-08-19 11:21:08 +02:00
unknown
f758ada4bc cosmetic change
sql/sql_class.h:
  comment
sql/sql_table.cc:
  smarter use of the Disable_binlog object (using a block so that when leaving it either way, the object gets
  destroyed and so properties of the thread get reset).
2004-08-19 10:01:01 +02:00
unknown
e769d459f7 copied new my_vsnprintf from 4.1. use "ul" when merging
BitKeeper/etc/ignore:
  Added EXCEPTIONS-CLIENT to the ignore list
2004-08-19 02:35:59 +02:00
unknown
ac866d9e94 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-19 00:43:48 +02:00
unknown
95334ac6c7 Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().


mysql-test/r/rpl_heap.result:
  result update
mysql-test/t/rpl_heap.test:
  testing a bug
sql/log.cc:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/mysql_priv.h:
  removing argument no_log from mysql_create_table(); no_log was perfect as some
  binlogging could still be done by open_unireg_entry() for a HEAP table.
sql/sql_class.h:
  new class Disable_binlog used to temporarily disable binlogging for one thread.
sql/sql_parse.cc:
  removing no_log
sql/sql_table.cc:
  removing no_log from mysql_create_table(); instead using new class Disable_binlog.
  Disabling binlogging in some cases, where the binlogging is done later by some other code
  (case of CREATE SELECT and ALTER).
2004-08-19 00:29:11 +02:00
unknown
0c6b96658e Bug 4937: different date -> string conversion when using
SELECT ... UNION and INSERT ... SELECT ... UNION
2004-08-18 14:46:31 +02:00
unknown
8ddcba9d8a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-18 09:25:27 +02:00
unknown
0c062ae60f srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:
Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri) 


sql/ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
sql/mysqld.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/include/srv0start.h:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/include/ut0dbg.h:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/ut/ut0dbg.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/ut/ut0mem.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
innobase/srv/srv0start.c:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
2004-08-18 01:48:01 +03:00
unknown
fdc8712cb0 use my_vsnprintf() just in case
bug#4925
2004-08-18 00:04:43 +02:00
unknown
35daaa5e15 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-17 17:34:53 +02:00
unknown
d13c9acff8 Fix for BUG#5073 "--disable-local-infile has no effect if client reads it with MYSQL_READ_DEFAULT":
that was a forgotten '~' probably.


libmysql/libmysql.c:
  When we read "disable-local-infile" from the option file specified by mysql_options(MYSQL_READ_DEFAULT_FILE),
  we must take CLIENT_LOCAL_FILES down (it was probably a forgotten '~').
2004-08-17 14:12:37 +02:00
unknown
0f7bf1199b Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-08-17 14:30:36 +03:00
unknown
1146f38f32 A fix (bug : SQL_SELECT_LIMIT=0 crashes command line client):
mysql outwits itself.
2004-08-17 11:12:22 +05:00
unknown
b5ea2224a6 A desperate attempt to comment one place where we do conversions. 2004-08-16 15:07:45 -07:00
unknown
fcb6f9a4ef Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-08-16 19:06:01 +03:00
unknown
750f619325 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-14 15:25:52 +02:00
unknown
f95c6fb5c0 Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make install'":
The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.


mysql-test/Makefile.am:
  The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
  Putting a * before 001 so that it works for 6-digit extensions of 4.1.
2004-08-14 15:24:40 +02:00
unknown
6ca6579587 row0mysql.c:
Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table


innobase/row/row0mysql.c:
  Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
2004-08-13 17:27:58 +03:00
unknown
9003c146b8 - manual merge 2004-08-13 16:25:23 +02:00
unknown
621506815f Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT:
this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to
10.3.5) and is expected to fix 
BUG#2030 "relay bin log on slave resets multiple times a second"
(i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT).
So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals.
Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
where using SSL seems to make the problem more frequent...


configure.in:
  Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
  Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT.
sql/mysqld.cc:
  optionally ignore SIGHUP and SIGQUIT, for some Mac OS X Panther versions which send too many of those.
2004-08-13 15:29:47 +02:00
unknown
271b2dd886 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-08-13 12:44:08 +02:00
unknown
4dfe16c287 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
2004-08-13 02:27:21 +05:00
unknown
a88902033a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0


sql/sql_select.cc:
  Auto merged
2004-08-13 02:25:50 +05:00
unknown
72ca699723 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
2004-08-13 01:25:35 +05:00
unknown
cbf8c35974 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
2004-08-13 01:21:22 +05:00
unknown
d202aefd99 - portability fix for SCO Open Server 5.0.7 (thanks to Boyd Gerber) 2004-08-12 21:55:05 +02:00
unknown
4ba06ba7b8 - Fixed two small version number issues in MySQL-shared-compat.spec
support-files/MySQL-shared-compat.spec.sh:
   - fixed using the correct version number
   - bumped up the 3.23 version number to current
2004-08-12 21:40:34 +02:00
unknown
7b0a538b14 - giving a range does not work for platform detection in configure.in
- resorting to having to separate sections for darwin7 and darwin8


configure.in:
   - giving a range does not work here - resorting to having to
     separate sections for darwin7 and darwin8
2004-08-12 21:15:49 +02:00
unknown
7e5247aade fixed Bug Problem with HAVING clause that uses alias
from the select list and TEXT field 

make setup_copy_fields to insert Item_copy_string for blobs in 
the beginning of the copy_funcs (push_back instead of push_front)

the thing is that Item_copy_string::copy for function can call 
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before, 
it's value will be wrong.

So all the Item_copy_string::copy for blobs should be called before 
Item_copy_string::copy for functions.


mysql-test/r/having.result:
  added test case for
  Bug  Problem with HAVING clause that uses
              alias from the select list and TEXT field
mysql-test/t/having.test:
  added test case for
  Bug  Problem with HAVING clause that uses
              alias from the select list and TEXT field
sql/sql_select.cc:
  make setup_copy_fields to insert Item_copy_string for blobs in 
  the beginning of the copy_funcs (push_back instead of push_front)
  
  the thing is that Item_copy_string::copy for function can call 
  Item_copy_string::val_int for blob via Item_ref.
  But if Item_copy_string::copy for blob isn't called before, 
  it's value will be wrong.
  
  So all the Item_copy_string::copy for blobs should be called before 
  Item_copy_string::copy for functions.
  
  fixed 
  Bug  Problem with HAVING clause that
             uses alias from the select list and TEXT field
2004-08-12 20:37:31 +05:00
unknown
502dc70db6 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-08-12 13:52:43 +02:00
unknown
c4ac826376 Added initial sorting in order to make test case repeatable. 2004-08-12 16:16:38 +05:00
unknown
ab9b33597e Added initial sorting in order to make test case repeatable. 2004-08-12 16:02:12 +05:00
unknown
4cf9fc59e7 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-08-12 12:10:36 +02:00
unknown
1b666071d1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
2004-08-12 14:59:33 +05:00
unknown
6bd68efaf6 A test case (bug : User privileges depending on ORDER BY Settings of table db) 2004-08-12 14:49:16 +05:00
unknown
bb10ca26ec A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db) 2004-08-12 09:41:35 +05:00
unknown
acf5df3a6d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411


BitKeeper/etc/logging_ok:
  auto-union
2004-08-11 23:26:44 +01:00
unknown
4f08c4b726 Bug#4411
Fix for server hang bug


mysql-test/r/heap.result:
  Bug#4411
    Test for server hang bug
mysql-test/t/heap.test:
  Bug#4411
    Test for server hang bug
sql/opt_sum.cc:
  Bug#4411
    Allow code to exit the loop.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-08-11 23:24:36 +01:00
unknown
4c6f6c60d5 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-11 23:44:08 +02:00
unknown
ab64eb64af Bug - 32 bit and 64 bit builds behave differently on int32 overflow
include/my_global.h:
  uint_max constants moved from sql_analyse.cc
sql/sql_analyse.cc:
  cleanup
2004-08-11 23:43:41 +02:00
unknown
f82898f185 - fixed Log file naming in Boostrap
Build-tools/Bootstrap:
   - fixed Log file naming
2004-08-11 23:01:08 +02:00
unknown
367e686d3e Bootstrap enhancements:
- Changed the default log file name to Bootstrap-<repository>.log
   (e.g. Bootstrap-mysql-4.0.log) (thanks to Joerg for the hint)
 - added option "--archive-log" to automatically move the log file
   into the Log directory of the exported tree


Build-tools/Bootstrap:
   - Changed the default log file name to Bootstrap-<repository>.log
     (e.g. Bootstrap-mysql-4.0.log) (thanks to Joerg for the hint)
   - added option "--archive-log" to automatically move the log file
     into the Log directory of the exported tree
2004-08-11 22:03:12 +02:00
unknown
b0fcf80b23 fixed Bug Memory is not released when HEAP table is dropped
sql/ha_heap.cc:
  added calling fn_format(name,..) for name before heap_delete_table
  as it's done before heap_create
  
  fixed Bug  Memory is not released when HEAP table is dropped
2004-08-11 18:55:12 +05:00
unknown
5ee446d9d0 - fixed non-predictable floating point results in func_math by adding
format() around them (as suggested by serg)
2004-08-11 13:11:59 +02:00