mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27336 commits 2784 branches 343 tags 1.6 GiB
Commit graph

27336 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
305b58b8a2 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-26 15:47:56 -07:00
jimw@mysql.com
607c129737 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-26 14:11:08 -07:00
brian@zim.(none)
ff6cfe6d66 Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table. 2005-10-26 13:55:08 -07:00
brian@zim.(none)
22644b5f1c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-26 09:08:44 -07:00
SergeyV@selena.
0eacb6fb35 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#14137-mysql-5.0
 2005-10-26 19:05:02 +04:00
reggie@big_geek.
de428f6654 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  big_geek.:C:/Work/mysql/mysql-5.0
 2005-10-26 09:47:12 -05:00
SergeyV@selena.
14e90138e5 Formatting change for #14137 patch. 2005-10-26 17:45:30 +04:00
kent@mysql.com
cd0592136a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-26 11:45:41 +02:00
reggie@big_geek.
dec2640dbf changed define from EXTERN_C to EXTERNC so it doesn't conflict with 
another macro defined in the Windows header files.
 2005-10-25 23:51:05 -05:00
kent@mysql.com
77ecd8d968 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-26 00:03:27 +02:00
jimw@mysql.com
a4cc61f213 Merge mysql.com:/home/jimw/my/mysql-5.0-13534 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-25 13:42:04 -07:00
brian@zim.(none)
da60b60207 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-25 11:03:22 -07:00
sasha@asksasha.com
63bac8c4e4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.0-bug12974
 2005-10-25 11:25:46 -06:00
pgalbraith@mysql.com
adcc3ac935 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/data0/mysqldev/patg/mysql-5.0-viewfix
 2005-10-25 19:16:08 +02:00
pgalbraith@mysql.com
feca138e46 This cset fixes BUG# 12838, 14061, 12129 
mysqldump.result:
  BUG# 12838
      New test results for mysqldump -x on a DB with views
mysqldump.test:
  sqldump.test:
      BUG# 12838
      New test to run mysqldump -x on a DB with views
mysqldump.c:
  BUG# 12838
      Removed/Changed code which created tables to be put into the dump
      (For loading views of views) by creating temp tables and then using
      the CREATE TABLE information in those temp tables. The problem with this
      is that when mysqldump -x is called, it locks all tables, so the
      temp tables could not be created, causing the mysqldump to exit with
      failure. The code was changed to use SHOW FIELDS to get the column
      names and type to build CREATE TABLE text used to create these tables
      that views need in the dump.
 2005-10-25 19:04:31 +02:00
hf@deer.(none)
526315ebfa Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 22:04:20 +05:00
hf@deer.(none)
50a8dbc8c2 Merge deer.(none):/home/hf/work/mysql-5.0.13820 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 21:10:58 +05:00
hf@deer.(none)
8cd0241439 Merge deer.(none):/home/hf/work/mysql-5.0.13667 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 21:09:37 +05:00
hf@deer.(none)
bcebef8958 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 21:08:22 +05:00
acurtis@zim.(none)
cd19a1481e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/acurtis/mysql-5.0-noraid.2
 2005-10-25 08:18:32 -07:00
acurtis@zim.(none)
1d860c2dbe Deprecate RAID create options 2005-10-25 08:15:37 -07:00
brian@zim.(none)
d5c90efe97 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-25 07:29:40 -07:00
reggie@big_geek.
2e637a0b36 fix issue with IM that causes commandlines that are executed to be incorrect. 2005-10-25 09:29:39 -05:00
hf@deer.(none)
86e358f1c8 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into deer.(none):/home/hf/work/mysql-5.0.12267
 2005-10-25 19:08:33 +05:00
ramil@mysql.com
c88f0e9c19 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b14207
 2005-10-25 16:06:46 +05:00
pem@mysql.com
3e9f3c3205 Converted mysys/base64.c into C code (not C++). 2005-10-25 11:30:43 +02:00
anozdrin@mysql.com
afb50a5de1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13037
 2005-10-25 13:04:46 +04:00
anozdrin@mysql.com
831de41ca6 Fix for BUG#13037: undefined variable in IF cause erroneous error-message. 2005-10-25 13:02:48 +04:00
ramil@mysql.com
70ba090d27 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b10303
 2005-10-25 12:19:13 +05:00
brian@zim.(none)
ab0b049f85 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-10-24 23:57:15 -07:00
brian@zim.(none)
068f082960 Additional test request by Jonas. We check pushdown conditions for GEOM types. 2005-10-24 23:55:44 -07:00
brian@zim.(none)
82bcb8b369 This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB. 2005-10-24 23:20:39 -07:00
timour@mysql.com
d24027fa79 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-13832
 2005-10-25 09:01:47 +03:00
timour@mysql.com
f5354eba90 Fix for BUG#13832 - Unknown column t1.a in 'on clause'. 
The cause for the bug is that the priorities of all rules/terminals
that process the FROM clause are not fully specified, and the
parser generator produces a parser that doesn't always parse
the FROM clause so that JOINs are left-associative. As a result
the final join tree produced by the parser is incorrect, which
is the cause for subsequent name resolution to fail.
 2005-10-25 09:00:57 +03:00
kent@mysql.com
3e62fcf2a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-25 03:00:09 +02:00
kent@mysql.com
257b17ba2f Makefile.am: 
Option to set environment variable MTR_BUILD_THREAD to a small
  number, from what mysql-test-run calculate port numbers that
  will not conflict with other runs with different thread num
 2005-10-25 02:27:55 +02:00
lars@mysql.com
192bceafd9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
 2005-10-25 00:37:08 +02:00
lars@mysql.com
a9d03b67c4 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
 2005-10-25 00:23:14 +02:00
lars@mysql.com
7694eecc7d Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
 2005-10-25 00:16:51 +02:00
lars@mysql.com
8124629c51 Fixed enum numbering, patch 2 2005-10-24 23:09:14 +02:00
anozdrin@mysql.com
bfc8e85b06 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
 2005-10-25 00:57:23 +04:00
anozdrin@mysql.com
6d2934cb69 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
 2005-10-25 00:55:31 +04:00
anozdrin@mysql.com
6105040ac4 Fix for BUG#13095: Cannot create VIEWs in prepared statements 
- allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
  - fix CREATE VIEW implementation to make it work in prepared statements.
 2005-10-25 00:54:04 +04:00
patg@krsna.patg.net
4fdeb1f93b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
 2005-10-24 13:52:26 -07:00
patg@krsna.patg.net
89b2b92b4e Disabled federated test, added then removed 
federated.disabled and instead using disabled.def (per
comments in this commit)

disabled.def:
  disabled federated until bug 14272 is fixed.
.del-federated.disabled~9e4cca59f547174d:
  Delete: mysql-test/t/federated.disabled
federated.disabled:
  New BitKeeper file ``t/federated.disabled'' to disable federated test until
  Bug 14272 is fixed.
  new file
 2005-10-24 13:51:05 -07:00
sergefp@mysql.com
9a101971cf BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in 
OPTIMIZE TABLE.
 2005-10-25 00:27:15 +04:00
lars@mysql.com
827d745c89 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
 2005-10-24 20:03:40 +02:00
lars@mysql.com
4ce4068442 Reducing risk for incorrect merges. Since we are multiple teams working on 
different features, adding numbering to enums reduce the risk that code will
be merged incorrectly.  This particular enum must have fixed values to ensure
that an upgraded server always can read old logs.  I added this, since I 
noticed the incorrect order in the RBR clone.
 2005-10-24 19:06:32 +02:00
SergeyV@selena.
ba919bd168 Fixes bug #14137. Converts charsets_dir path to underlying 
system representation.
 2005-10-24 20:08:56 +04:00
lars@mysql.com
fbcf26777e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-24 17:23:45 +02:00