Commit graph

19690 commits

Author SHA1 Message Date
ramil@mysql.com
fcc51afb6a Populate t1 in order to get more predictable explain results. 2005-10-07 20:14:34 +05:00
joerg@mysql.com
01a374d955 Copy zlib.a and valgrind.supp if exists.
Copy disabled.def
(Backport of Kent's change from the main tree to the 4.1.15 build clone.
Original changeset:  2005/10/07 13:08:07+02:00 kent@mysql.com )
2005-10-07 16:37:53 +02:00
monty@mysql.com
3f73d25fba Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-10-07 04:02:53 +03:00
monty@mysql.com
82855517a1 Review of new code since last pull
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null
2005-10-07 03:12:15 +03:00
kent@mysql.com
ae62a58817 make_binary_distribution.sh:
Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)
2005-10-07 01:56:11 +02:00
kent@mysql.com
87016b438c make_binary_distribution.sh:
Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable
2005-10-06 22:57:13 +02:00
dean@mysql.com
dd241c4b8e Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/dellis/mysqlab/bk/mysql-4.1
2005-10-06 15:42:35 -05:00
kent@mysql.com
52181cc810 make_binary_distribution.sh:
Replaced --machine with --platform
  General code cleanup
2005-10-06 18:00:23 +02:00
gluh@mysql.com
a67fcc4669 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.13605
2005-10-06 19:58:51 +05:00
gluh@eagle.intranet.mysql.r18.ru
fbc621e545 Fix for bug#13605 'rpl_openssl' test hangs 2005-10-06 19:51:08 +05:00
kent@mysql.com
5e204d46f1 Merge 2005-10-06 15:42:50 +02:00
bar@mysql.com
905c8b8c88 item_cmpfunc.cc:
Wrong variable.
2005-10-06 15:26:59 +05:00
pekka@mysql.com
45dcaf968d ndb - prelim perl scripts to autotest 2005-10-06 09:44:25 +02:00
bar@mysql.com
ab2caf6de8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
2005-10-05 17:35:42 +05:00
msvensson@neptunus.(none)
0588cc35f4 Revert 2005-10-05 14:35:41 +02:00
bar@mysql.com
1fb8ea3714 item_cmpfunc.cc:
wrong variable.
2005-10-05 17:33:39 +05:00
bar@mysql.com
a98e6dfe44 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
2005-10-05 11:28:08 +05:00
georg@lmy002.wdf.sap.corp
f846bc32c1 Windows compilation fix: Added typecast (const char* to char *) 2005-10-04 10:54:58 +02:00
marko@hundin.mysql.fi
8732235f85 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-4.1
2005-10-04 00:21:54 +03:00
marko@hundin.mysql.fi
bf30733840 Merge hundin.mysql.fi:/home/marko/mysql-4.0
into  hundin.mysql.fi:/home/marko/mysql-4.1
(Bug #13002)
2005-10-03 17:54:39 +03:00
marko@hundin.mysql.fi
d62b9f4b4b InnoDB: Display an error message in /* */ comments
in SHOW CREATE TABLE if a temporary file cannot be created.
(Bug #13002)
2005-10-03 17:46:27 +03:00
msvensson@neptunus.(none)
a4c636a587 Move -ansi flag from global_warnings to cxx_warnings 2005-10-03 16:24:47 +02:00
heikki@hundin.mysql.fi
5dc00e0cac os0sync.c:
Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005
2005-10-03 00:05:50 +03:00
marko@hundin.mysql.fi
96d77a34e9 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  hundin.mysql.fi:/home/marko/mysql-4.1
2005-09-30 16:02:19 +03:00
marko@hundin.mysql.fi
17b0098127 InnoDB: After review fix 2005-09-30 15:06:41 +03:00
kent@mysql.com
21cf818a8d Many files:
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
2005-09-30 14:03:55 +02:00
marko@hundin.mysql.fi
8c1ccbc903 InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178) 2005-09-30 13:58:00 +03:00
jonas@perch.ndb.mysql.com
6169d529e5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-30 12:25:46 +02:00
jonas@perch.ndb.mysql.com
f334a14952 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-30 12:24:56 +02:00
jonas@perch.ndb.mysql.com
bb70442366 ndb_config
Check returnvalue on load/fetch configuration
2005-09-30 12:22:00 +02:00
jonas@perch.ndb.mysql.com
a30faa3b34 ndb -
add support for reading config.ini from ndb_config
 (as alternative to contacting ndb_mgmd)
2005-09-30 11:39:49 +02:00
msvensson@neptunus.(none)
12c443d0fe Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-30 10:40:48 +02:00
stewart@mysql.com
43d244652b Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-30 14:34:53 +10:00
kent@mysql.com
822a4ac5bb mtr_report.pl:
Text formatting, adjust table header
mysql-test-run.pl:
  Remove requirement for source tree to run embedded server test
mysqldump.test:
  Removed ending ';' from --exec line
2005-09-30 00:52:18 +02:00
ingo@mysql.com
bd417d158e Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-29 15:09:05 +02:00
ingo@mysql.com
dec9e7bb48 Merge mysql.com:/home/mydev/mysql-4.0
into  mysql.com:/home/mydev/mysql-4.0-4000
2005-09-29 15:08:51 +02:00
lenz@mysql.com
68e6b0e21d Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-09-29 13:57:41 +02:00
lenz@mysql.com
443048f61c - fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPM
spec file (the $RBR variable did not get expanded, thus leaving old build
   roots behind)
2005-09-29 13:55:54 +02:00
ingo@mysql.com
5c93e799d8 Merge mysql.com:/home/mydev/mysql-4.0-4000
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-29 13:44:17 +02:00
ingo@mysql.com
1af69fca94 Bug#9112 - Merge table with composite index producing invalid results with some queries
Second platform fix for floating point rounding.
2005-09-29 13:37:30 +02:00
gluh@eagle.intranet.mysql.r18.ru
f9762c47d0 Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
  printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
  "AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only 
  if NO_FIELD_OPTIONS is not set.
2005-09-29 16:17:45 +05:00
bar@mysql.com
7fe434098e Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
2005-09-29 16:07:33 +05:00
msvensson@neptunus.(none)
d3deacabd1 Add -ansi flag when building with gcc 2005-09-29 10:30:20 +02:00
ingo@mysql.com
68bc5a31e4 Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-4100
2005-09-29 09:36:44 +02:00
stewart@mysql.com
82e95b6a3c Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-29 16:56:26 +10:00
stewart@mysql.com
b4043e31a0 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/wl2779
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-29 16:55:28 +10:00
stewart@mysql.com
9e87252c47 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
2005-09-29 16:52:38 +10:00
stewart@mysql.com
45f667cd85 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
2005-09-29 11:38:38 +10:00
kent@mysql.com
844d964f2d Many files:
Prefix regex functions/types with "my_" as our
  library is not compatible with normal regex lib.
my_regex.h:
  Rename: regex/regex.h -> regex/my_regex.h
2005-09-29 02:08:24 +02:00
dean@mysql.com
e82647cd9c Fix for BUG#13582. Theoretically possible to try to overallocate RAM in some fulltext queries. 2005-09-28 19:03:35 -05:00