Commit graph

19259 commits

Author SHA1 Message Date
unknown
563ebb4328 ut0mem.c:
Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space


innobase/ut/ut0mem.c:
  Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
2005-01-27 18:53:59 +02:00
unknown
9c02a35147 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 19:53:58 +03:00
unknown
3f0cb69a86 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 18:23:05 +03:00
unknown
295db433f3 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-01-27 15:12:33 +01:00
unknown
87fba51805 Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000


BUILD/SETUP.sh:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-27 12:18:02 +01:00
unknown
a271a6c878 Re-enabled the use of --prefix.
Adjusted the "Usage:" string.
Ordered the option recognition in reverse order from "Usage:".
2005-01-27 12:13:35 +01:00
unknown
99fdc5ef78 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:10:15 +01:00
unknown
4e5a513c4d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 15:10:06 +04:00
unknown
f6297a90ad Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:01:19 +01:00
unknown
199a139da1 item_timefunc.cc:
CAST now always return a well-formed character string.


sql/item_timefunc.cc:
  CAST now always return a well-formed character string.
2005-01-27 14:51:16 +04:00
unknown
9a9b3f285c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 14:16:54 +04:00
unknown
79414bb3d0 A fix: information_schema test fails on Mac OSX 2005-01-27 13:16:51 +03:00
unknown
513a70a34b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-27 13:01:57 +04:00
unknown
d22c000516 - added "../extra" to the include path of mysqltest.dsp (Windows compile
failed to find the newly introduced extra/mysqld_ername.h header file)


VC++Files/client/mysqltest.dsp:
  - added "../extra" to the include path (Windows compile failed to find the
    newly introduced extra/mysqld_ername.h header file)
2005-01-27 09:05:55 +01:00
unknown
1ea2bc38cf Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


sql/set_var.cc:
  Auto merged
2005-01-27 08:32:46 +01:00
unknown
fcb2f0cc4d Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 08:32:38 +01:00
unknown
70e47994c5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-26 17:15:11 -08:00
unknown
2362d9212b Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


BUILD/SETUP.sh:
  Auto merged
configure.in:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/univ.i:
  Auto merged
2005-01-26 22:34:23 +01:00
unknown
f50a65b0f1 Test bug: Memory leak in archive handler.
Added a call to close the meta file after a repair.
2005-01-26 22:31:42 +01:00
unknown
e130b45109 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0
2005-01-26 22:13:48 +02:00
unknown
bf6b46bba9 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


sql/set_var.cc:
  Auto merged
2005-01-26 21:09:16 +01:00
unknown
6154d76c43 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0


sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-01-26 11:53:33 -08:00
unknown
13ec3ef6c7 changes to get rid of compile warnings in both ha_federated.cc and ha_federated.h
sql/ha_federated.cc:
  changes to get rid of compile warnings
sql/ha_federated.h:
  changes to get rid of compile warnings
2005-01-26 11:47:28 -08:00
unknown
d2e2de1b59 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-01-26 10:42:46 -08:00
unknown
147640b823 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-26 18:36:18 +03:00
unknown
9b14dc8811 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-26 19:07:07 +04:00
unknown
01e8459895 Merge from 4.1
Archive fix by Ingo.
Innodb compile fix by Monty.


configure.in:
  Auto merged
innobase/include/univ.i:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_archive.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
innobase/fil/fil0fil.c:
  Merged Montys fix.
2005-01-26 15:51:46 +01:00
unknown
193650b8d9 timed_mutexes moved to include/my_sys.h and mysys/my_static.c
to avoid linking problems referring to the variable from .c programs.
2005-01-26 18:37:49 +04:00
unknown
bef575d1f3 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src
2005-01-26 15:33:10 +01:00
unknown
a496ad3fb6 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-01-26 15:31:31 +01:00
unknown
fee6edd964 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-26 15:31:06 +01:00
unknown
b6e0033171 Test Bug: Memory leaks in the archive handler.
Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.



mysql-test/t/archive.test:
  Test Bug: Memory leaks in the archive handler.
  Fixed a typo.
sql/examples/ha_archive.h:
  Test Bug: Memory leaks in the archive handler.
  Added declarations for the new init/cleanup functions.
sql/handler.cc:
  Test Bug: Memory leaks in the archive handler.
  Added calls of the new init/cleanup functions.
2005-01-26 15:27:31 +01:00
unknown
86016aeb45 Fixes for windows compilation bugs
(After review of cs georg:1.1800 by Monty)


VC++Files/libmysqld/libmysqld.dsp:
  removed ha_isammrg.cpp (doesn't exist anymore)
VC++Files/mysqldemb/mysqldemb.dsp:
  removed ha_isammrg.cpp (doesn't exist anymore)
extra/comp_err.c:
  renamed DATADIR to DATADIRECTORY (DATADIR is a windows internal
  enumeration type)
innobase/ut/ut0ut.c:
  gettimeofday is not available under Windows. Added conditional define
  which uses GetLocalTime for windows
libmysql/libmysql.c:
  fixed prototype for setup_one_fetch_function which differed from
  function declaration.
  Fixed not supported unsigned __int64 to double conversion
sql/field.h:
  fixed typecast error (windows)
sql/item_sum.cc:
  fixed typecast errors (windows)
sql/key.cc:
  fixed typecast errors (windows)
sql/opt_range.cc:
  fixed not supported unsigned __int64 to double conversion
sql/sql_acl.cc:
  fixed typecast errors (windows)
sql/table.cc:
  fixed typecast errors (windows)
2005-01-26 15:19:20 +01:00
unknown
57d89729ae Merge with 4.1 to get patch for Innodb debugging
configure.in:
  Auto merged
innobase/include/univ.i:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
innobase/fil/fil0fil.c:
  Merge with 4.1
2005-01-26 16:13:32 +02:00
unknown
b02d0ecde4 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src
2005-01-26 15:13:31 +01:00
unknown
21f3fac097 Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0
configure.in:
  Auto merged
2005-01-26 16:13:31 +02:00
unknown
99b8a16e4d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-26 15:13:30 +01:00
unknown
3c3ca269ec Only enable Innodb extra debugging when using the --debug=full configure option
BUILD/SETUP.sh:
  Abort if wrong options
BUILD/compile-pentium64-debug:
  Always use full debugging
innobase/fil/fil0fil.c:
  Fixed wrong printf() format
2005-01-26 16:07:53 +02:00
unknown
fbba239004 updated show table status usage in ndb tests to become independent on ndb cluster run 2005-01-26 15:07:39 +01:00
unknown
68d32bc338 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637


sql/mysqld.cc:
  Auto merged
2005-01-26 16:40:50 +03:00
unknown
f26d1bb4d9 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src
2005-01-26 14:40:49 +01:00
unknown
b7d9b72ab4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-26 17:40:49 +04:00
unknown
6c0644005c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-26 14:40:48 +01:00
unknown
ddad73b376 added check in ndb tests that require "default" cluster running
i.e. ndb_restore
2005-01-26 14:38:13 +01:00
unknown
a898252a45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-01-26 15:33:02 +02:00
unknown
edda6bb02c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-01-26 17:09:38 +04:00
unknown
21bc76b98f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-26 16:54:22 +04:00
unknown
9bb464487d CSC#4385: slow sorting for UTF8 large table:
my_strnxfrm_utf8 now requires 2 bytes per character
in filesort key, instead of 3 bytes per character.
Shorter filesort keys make sorting faster.
2005-01-26 16:34:09 +04:00
unknown
63fdb2cc59 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-26 16:26:19 +04:00
unknown
07aafda940 Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-01-26 13:24:00 +01:00