Commit graph

17140 commits

Author SHA1 Message Date
unknown
4734f3f746 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-02 11:13:35 +01:00
unknown
e7ff746989 backported configure flag from 5.0
workaround for HPUX signal.h error, missing extern "C" 
    moved my_thread_end to NdbThreadExit
   more checks for shared memory transporter signum setup


acinclude.m4:
  backported configure flag from 5.0
include/my_global.h:
  workaround for HPUX signal.h error, missing extern "C"
ndb/src/common/portlib/NdbThread.c:
  moved my_thread_end to NdbThreadExit
ndb/src/mgmsrv/ConfigInfo.cpp:
  more checks for shared memory transporter signum setup
2005-02-02 10:50:33 +01:00
unknown
f229695845 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-01 23:54:39 -08:00
unknown
4c76152b35 func_str.result, func_str.test:
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.


sql/item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
mysql-test/t/func_str.test:
  Added a test case for bug #7751.
mysql-test/r/func_str.result:
  Added a test case for bug #7751.
2005-02-01 23:34:31 -08:00
unknown
1a2ef2be00 ndb - backup fix, found on powermacg4
ndb/src/kernel/blocks/backup/Backup.cpp:
  index typo overwrote attribute array, found on powermacg4
2005-02-02 03:58:43 +01:00
unknown
f6cabbd7f4 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/include/eval0eval.ic:
  Auto merged
2005-02-02 01:47:46 +02:00
unknown
d5311abe2c eval0eval.ic:
Remove wrong assertion that fails on 64 bits


innobase/include/eval0eval.ic:
  Remove wrong assertion that fails on 64 bits
2005-02-02 01:43:25 +02:00
unknown
27d743576f Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/include/rem0rec.ic:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
2005-02-02 00:41:25 +02:00
unknown
3c04bddb04 rem0rec.ic:
Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed


innobase/include/rem0rec.ic:
  Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed
2005-02-02 00:31:06 +02:00
unknown
a1b7bbd74c Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/sql_class.h:
  Auto merged
2005-02-02 00:22:19 +02:00
unknown
cf660b001e cleanup and streamlining of thread create/exit in ndb 2005-02-01 19:01:37 +01:00
unknown
514b2364b4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql41
2005-02-01 08:46:56 -06:00
unknown
9ffdfea1cc Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2005-02-01 15:38:48 +02:00
unknown
7da72c932e Remove #if 0 as this only confuses the code withing adding anything 2005-02-01 15:36:48 +02:00
unknown
e1f418e140 merging 2005-02-01 17:20:32 +04:00
unknown
e729760daf after merge fix up:
we should use REPLACE for $hostaname queries to avoid problems when $hostname=localhost.
2005-02-01 17:13:44 +04:00
unknown
0451add301 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-02-01 13:30:16 +01:00
unknown
d59bc7f47a Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
Build-tools/Bootstrap:
  Auto merged
2005-02-01 13:19:21 +01:00
unknown
b3c74fb124 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-02-01 13:55:40 +02:00
unknown
9fe76ad98b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-01 11:05:29 +02:00
unknown
e5d8e72a78 After merge fixes
innobase/mem/mem0pool.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
configure.in:
  Ignore changes that were backported to 4.0
scripts/mysql_install_db.sh:
  Ignore Ramil's changes for now
2005-02-01 10:24:09 +02:00
unknown
199375cbc9 Bug #7390 perror.exe doesn't work
perror.c:
  Copy output of strerr to temp buffer to prevent system overwrite on Windows


extra/perror.c:
  Copy output of strerr to temp buffer to prevent system overwrite on Windows
2005-01-31 23:02:32 -06:00
unknown
99620cecd8 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 17:32:22 -08:00
unknown
af5e2a1034 Merge mysql.com:/home/jimw/my/mysql-4.1-6511
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
2005-01-31 15:30:34 -08:00
unknown
ec12a1f341 Merge mysql.com:/home/jimw/my/mysql-4.1-8134
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 15:29:55 -08:00
unknown
20745ec65f Merge mysql.com:/home/jimw/my/mysql-4.1-8148
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqldump.c:
  Auto merged
2005-01-31 15:28:33 -08:00
unknown
4b88e07159 Bug #6607 Create table... LIKE... with Windows Symlinks
sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table


sql/sql_table.cc:
  use fn_format to resolve symlinks in mysql_create_like_table
2005-01-31 17:24:18 -06:00
unknown
5df7e7bd71 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-31 22:30:40 +02:00
unknown
af39ee001d mem0pool.c:
Fix an assertion failure in 64-bit computers if UNIV_MEM_DEBUG is defined


innobase/mem/mem0pool.c:
  Fix an assertion failure in 64-bit computers if UNIV_MEM_DEBUG is defined
2005-01-31 22:28:55 +02:00
unknown
0e2e3df2b4 Removed duplicate close call and added archive to the debug build and test.
BUILD/compile-ia64-debug-max:
  Added archive for this build.
sql/examples/ha_archive.cc:
  Removed duplicate close call.
2005-01-31 12:17:34 -08:00
unknown
665a3efe89 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-01-31 11:03:57 -08:00
unknown
0f7fae73d1 - Bootstrap: Rename already existing build directories to something more
useful than *.old.<PID> - use the mtime of configure.in instead. 
  This gives us a time stamp of when this last build directory was created,
  e.g. "mysql-4.0.24-build-2005-01-31-16:47"


Build-tools/Bootstrap:
  - Rename already existing build directories to something more useful than
    *.old.<PID> - use the mtime of configure.in instead. This gives us a time
    stamp of when this last build directory was created, e.g.
    "mysql-4.0.24-build-2005-01-31-16:47"
2005-01-31 17:33:01 +01:00
unknown
6685c7a671 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug7011.4
2005-01-31 15:06:04 +00:00
unknown
0bd5c1e3b2 Bug#7011
Fix tests after merge from 4.0
2005-01-31 13:18:36 +00:00
unknown
ed9f484556 Bug#7011
Merge from 4.0


sql/sql_select.cc:
  Auto merged
2005-01-31 12:48:00 +00:00
unknown
4faf77a9fe BUG#8208 don't fsync unless something has been written
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-31 11:47:10 +01:00
unknown
b4ecba65de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000
2005-01-31 14:29:20 +04:00
unknown
a701afe24e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0
2005-01-31 14:04:18 +04:00
unknown
bcfa783bfb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6000
2005-01-31 12:27:33 +04:00
unknown
f5729e2c4d Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1


sql/set_var.cc:
  Auto merged
2005-01-31 09:36:07 +02:00
unknown
30025f3fdc Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-31 09:34:34 +02:00
unknown
934fde094c Bug#7011
Fix replication for multi-update
  new test - rpl_multi_update2


sql/mysql_priv.h:
  Bug#7011
    New function mysql_multi_update_lock()
sql/sql_parse.cc:
  Bug#7011
    New function check_multi_update_lock()
    For multi-update on slave, perform an early open&lock
sql/sql_update.cc:
  Bug#7011
    Split out multi-update locking into its own function,
      mysql_multi_update_lock()
2005-01-30 10:24:03 +00:00
unknown
f787145fc0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-30 00:32:14 +01:00
unknown
a88ca8f548 Fix for a "table is full" bug in multi-table updates (Bug #7788)
mysys/my_handler.c:
  Fix for a bug in multi table updates, when offset of one table is 
  5 bytes or more. This occured because in that case binary(5) indexed
  column is space packed, so it was hit by this bug in the function
  for binary comparison.
  Bug #7788
2005-01-29 22:56:00 +02:00
unknown
25c0775b16 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-29 20:04:33 +03:00
unknown
bcb31692fc Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql41
2005-01-29 09:41:23 -06:00
unknown
79016ecb2c Bug #5185 mysqldump for windows database gets table names with different case
mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers


client/mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers
2005-01-29 09:25:56 -06:00
unknown
15501915c6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-29 12:46:13 +01:00
unknown
7f25f21c25 Merging fix for BUG#7672 - the changes will not go into 4.1 2005-01-29 06:49:48 +03:00
unknown
fa0b4b5e8d Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1


sql/examples/ha_archive.cc:
  Auto merged
2005-01-28 18:10:47 -08:00