Commit graph

19361 commits

Author SHA1 Message Date
unknown
6a2b914190 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-01 17:09:36 +01:00
unknown
fe7b863412 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into bob.(none):/home/reggie/bk/mysql5.0
2005-02-01 08:19:57 -06:00
unknown
8a90aced5e Merge bob.(none):/home/reggie/bk/mysql41
into bob.(none):/home/reggie/bk/mysql5.0


extra/perror.c:
  Auto merged
2005-02-01 08:16:45 -06:00
unknown
f7606a335e Skip cp932 and eucjpms tests when the character sets are not compiled. 2005-02-01 14:37:51 +04:00
unknown
b95c2d3578 character_sets.m4:
--with-uca configure.in argument.
  The rest of the changes are pending from 4.1 tree


config/ac-macros/character_sets.m4:
  --with-uca configure.in argument.
  The rest of the changes are pending from 4.1 tree
2005-02-01 11:50:43 +04: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
8f795d9e6e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into bob.(none):/home/reggie/bk/mysql5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-31 22:26:12 -06:00
unknown
e71e8b933c Merge bob.(none):/home/reggie/bk/mysql41
into bob.(none):/home/reggie/bk/mysql5.0


BitKeeper/etc/logging_ok:
  auto-union
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-01-31 22:24:04 -06:00
unknown
6e0691f54f Update client_xml test to avoid timestamp-sensitive part of test.
mysql-test/t/client_xml.test:
  Exclude create in mysqldump test, it includes timestamp
mysql-test/r/client_xml.result:
  Update result file
2005-01-31 18:48:42 -08:00
unknown
41763b20e2 Merge mysql.com:/home/jimw/my/mysql-4.1-7811
into mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
2005-01-31 17:51:45 -08:00
unknown
ac5e79b9a1 Update test results after bug-fix merge.
mysql-test/r/mysqldump.result:
  Fix results
2005-01-31 17:31:42 -08:00
unknown
8b08a2e87f Merge
BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
strings/ctype-simple.c:
  SCCS merged
2005-01-31 16:27:17 -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
dd385f2493 Bug#7011
Fix for merge from 4.1
2005-01-31 20:49:37 +00:00
unknown
60f628f264 Bug#7011
Merge from 4.1


sql/sql_select.cc:
  Auto merged
2005-01-31 15:57:32 +00: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
6b6a48ca15 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-01-31 10:31:59 +01:00
unknown
db7c18c351 Merge 2005-01-31 10:24:33 +01:00
unknown
113ff8c9d9 InnoDB: Cleanups of TRUNCATE TABLE code
innobase/row/row0mysql.c:
  row_truncate_for_mysql(): Always lock the data dictionary.
  row_truncate_for_mysql(): Improve comments and diagnostic messages.
sql/ha_innodb.cc:
  delete_all_rows(): Replace innobase_commit_low()
  with innobase_commit(). (partial fix to Bug #8151)
2005-01-31 10:35:56 +02: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
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
98f97f2260 Merge sinisa.nasamreza.org:/mnt/work/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/petica


mysys/my_handler.c:
  Auto merged
2005-01-29 23:00:17 +02: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
0e94559d4e Merge mysql.com:/home/dlenev/src/mysql-4.1-tzbug
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-29 20:06:58 +03: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
3c2ac1fc76 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-29 19:57:29 +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
70dfda8851 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into bob.(none):/home/reggie/bk/mysql5.0
2005-01-29 09:37:06 -06:00
unknown
ac442b96e1 Merge
client/mysqldump.c:
  merged changes for bug #5185 into the 50 tree.
2005-01-29 09:34:36 -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
aeebe7041c mysql-test-run.sh:
Old Solaris 'test' lack -e


mysql-test/mysql-test-run.sh:
  Old Solaris 'test' lack -e
2005-01-29 15:59:29 +01: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
d5a4968e16 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
2005-01-29 07:04:04 +01:00
unknown
12f28354cc Merge mysql.com:/home/psergey/mysql-4.1-look2
into mysql.com:/home/psergey/mysql-5.0-merge


mysql-test/r/order_by.result:
  SCCS merged
mysql-test/t/order_by.test:
  SCCS merged
sql/sql_yacc.yy:
  SCCS merged
2005-01-29 07:11:47 +03: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
c2383412b2 Fix error in string comparisons with CHAR(31) against the space-padding
of strings of unequal length. (Bug #8134)


mysql-test/t/compare.test:
  Add new regression test
strings/ctype-simple.c:
  Fix value used for swapping negative/positive values using XOR
mysql-test/r/compare.result:
  Add new test result
2005-01-28 17:18:35 -08:00
unknown
af68c169ab Fix test results for mysqldump test. Part of Bug #8148.
mysql-test/r/mysqldump.result:
  Update results
2005-01-28 12:13:01 -08:00
unknown
d848286e70 Use single quotes to set SQL_MODE in mysqldump output in case ANSI_QUOTES
was already defined on the server the dump is loaded into. (Bug #8148)


client/mysqldump.c:
  Use single quotes when setting SQL_MODE
2005-01-28 11:16:49 -08:00
unknown
dde53fbb96 ndb_opt_defaults.h:
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms


ndb/include/ndbapi/ndb_opt_defaults.h:
  removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-01-28 19:28:14 +01:00
unknown
158020b796 there's no need to define UNIV_DEBUG explicitly anymore 2005-01-28 19:03:07 +01:00
unknown
852bdc619a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-28 17:15:51 +01:00
unknown
5c3c40798d small Makefile.am cleanup
clean: targets removed
    generated *.h files moved to include/


Docs/Images/Makefile.am:
  no clean: targets please!
client/Makefile.am:
  generated *.h files moved to include/
extra/Makefile.am:
  generated *.h files moved to include/
include/Makefile.am:
  no clean: targets please!
libmysql/Makefile.am:
  generated *.h files moved to include/
libmysql_r/Makefile.am:
  generated *.h files moved to include/
libmysqld/Makefile.am:
  generated *.h files moved to include/
libmysqld/examples/Makefile.am:
  generated *.h files moved to include/
  no clean: target please!
ndb/docs/Makefile.am:
  no clean: targets please!
scripts/Makefile.am:
  SUPERCLEANFILES means nothing
server-tools/instance-manager/Makefile.am:
  generated *.h files moved to include/
sql/Makefile.am:
  generated *.h files moved to include/
sql/share/Makefile.am:
  instead of (incorrectly) duplicating comp_err command line,
  call do make in extra/
tools/Makefile.am:
  generated *.h files moved to include/
BitKeeper/etc/ignore:
  Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list
2005-01-28 17:14:03 +01:00
unknown
845367618f Merge mysql.com:/home/dlenev/src/mysql-4.1-tzbug
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-28 19:09:29 +03:00