Commit graph

26810 commits

Author SHA1 Message Date
patg@krsna.patg.net
328f5ef534 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-09-29 13:54:36 -07:00
patg@krsna.patg.net
a0119345e1 New flags for new max-no-ndb build script to get a build that has
everything except NDB
2005-09-29 13:45:39 -07:00
kent@mysql.com
3b906e73d8 portability.h:
Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets
2005-09-29 19:37:03 +02:00
pem@mysql.com
44b4e9fc82 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 16:41:46 +02:00
ramil@mysql.com
920e456549 fix for bug #13545: Server crash caused by select query. 2005-09-29 19:34:21 +05:00
georg@lmy002.wdf.sap.corp
e445a3d8e3 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0
2005-09-29 16:15:00 +02:00
pem@mysql.com
f85dd7cee5 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 15:53:28 +02:00
ingo@mysql.com
0e75a93af4 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 15:09:07 +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
4689bc8bf0 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 14:48:14 +02:00
pem@mysql.com
9f20feea5b Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 14:35:08 +02:00
lenz@mysql.com
54d60d7fa7 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-29 14:35:07 +02:00
gluh@eagle.intranet.mysql.r18.ru
cac5b085cd after merge fix 2005-09-29 17:21:32 +05:00
ingo@mysql.com
0af6e68acf Merge mysql.com:/home/mydev/mysql-4.1-4100
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 14:07:32 +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@mysql.com
b36f63e3ab 4.1 -> 5.0 merge 2005-09-29 16:35:50 +05:00
jan@hundin.mysql.fi
36edcbf4fa Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/mysql-5.0
2005-09-29 14:30:05 +03: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
jan@hundin.mysql.fi
81f51fd47b Fix incorrectly merged changeset, these may not be before a first 5.0 test
i.e. range test.
2005-09-29 13:50:27 +03:00
pem@mysql.com
f641fdb640 Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 12:39:28 +02:00
osku@127.(none)
4676fc94c6 Merge 127.(none):/home/osku/mysql/5.0/clean
into  127.(none):/home/osku/mysql/5.0/revcpy
2005-09-29 13:39:27 +03:00
georg@lmy002.wdf.sap.corp
2e05b3b125 Fix for bug #13451 (memleak in rename view) after Dmitri's review:
- call explicitly destructor for view's LEX
- cs fixes
2005-09-29 12:29:58 +02:00
jan@hundin.mysql.fi
43b2dc617b Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/mysql-5.0
2005-09-29 13:15:09 +03:00
osku@127.(none)
ad52436711 InnoDB: Fix potential buffer underflow. 2005-09-29 13:02:18 +03:00
ingo@mysql.com
3ae0c86070 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 11:56:59 +02:00
pem@mysql.com
66fa4ffbdf Merge mysql.com:/usr/local/bk/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.0
2005-09-29 11:37:28 +02:00
marko@hundin.mysql.fi
d426c109f4 Minor corrections to InnoDB function comments 2005-09-29 12:37:27 +03:00
stewart@mysql.com
875f8abdc2 merge fixes - SingleUser logging 2005-09-29 19:01:53 +10:00
stewart@mysql.com
116e4f2b4b Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-09-29 17:48:49 +10:00
serg@serg.mylan
e5dd31e1da the test changed to be, simpler, faster, and easier to read 2005-09-29 09:41:30 +02:00
ingo@mysql.com
824dbfe34b Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-5000
2005-09-29 09:37:21 +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
jan@hundin.mysql.fi
6734ca6cbe Fixed a bug checksum table locks the InnoDB table and does not use a
consistent read (Bug #12669). This fixes InnoDB part of the bug.
2005-09-29 08:34:38 +03:00
stewart@mysql.com
5e70387fb8 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2005-09-29 12:46:46 +10:00
brian@zim.(none)
db486f4da1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/archive-move
2005-09-28 19:07:43 -07:00
brian@zim.(none)
da101b3b5a Moving archive from example to sql. 2005-09-28 19:04:51 -07: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
656b0cc15a Merge 2005-09-29 03:20:31 +02: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
kent@mysql.com
7e6a78a1ae mtr_process.pl:
Append to some of the log files, not overwrite
2005-09-28 23:53:31 +02:00
kent@mysql.com
7d33bdeffa mysql-test-run.pl:
Append to some of the log files, not overwrite.
  Changed introduction text to reflect the current
  status of the Perl version of mysql-test-run.
  Some code cleanup.
2005-09-28 23:52:10 +02:00
kent@mysql.com
fdeceae81f mysql-test-run.pl:
Pass on all --skip-* to mysqld
2005-09-28 23:24:44 +02:00
lenz@mysql.com
6e10a589e1 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-28 23:05:42 +02:00
lenz@mysql.com
972d85af8b - compile fix: don't use C++ - style comments in .c files! 2005-09-28 23:04:35 +02:00