Commit graph

22301 commits

Author SHA1 Message Date
mskold@mysql.com
47c2c96379 Merge 2005-04-28 10:28:56 +02:00
mskold@mysql.com
bbee23435d Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes 2005-04-28 09:39:29 +02:00
msvensson@neptunus.(none)
1ba85ac979 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.
2005-04-27 22:20:58 +02:00
msvensson@neptunus.(none)
1ee4426adc Little different behaviour in 5.0 and merge with new tests required these changes 2005-04-27 22:02:26 +02:00
msvensson@neptunus.(none)
c76c23fcbc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 18:28:57 +02:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
msvensson@neptunus.(none)
01a954b2c0 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 17:52:47 +02:00
msvensson@neptunus.(none)
49818d6f2d After review fix 2005-04-27 17:52:14 +02:00
mskold@mysql.com
96b42c1241 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-27 17:12:08 +02:00
pem@mysql.com
254bb2570c Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-27 16:37:09 +02:00
pem@mysql.comhem.se
f769a7a8b0 Post-review fixes of the patch for BUG#8408: Stored procedure crash if function contains SHOW
(Review on irc by monty)
2005-04-27 16:35:49 +02:00
ramil@mysql.com
79f049f7b0 after-merge fix 2005-04-27 19:06:47 +05:00
ramil@mysql.com
bc6d650169 merging 2005-04-27 19:00:27 +05:00
joerg@mysql.com
4f1a696f9a Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-27 15:50:11 +02:00
ramil@mysql.com
82fc2ce8b7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b9803
2005-04-27 17:20:29 +05:00
pem@mysql.com
79cf164767 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-27 14:10:33 +02:00
heikki@hundin.mysql.fi
ce2c8126a2 handler.cc:
Fix compilation error if HAVE_REPLICATION is not defined
2005-04-27 15:09:41 +03:00
georg@lmy002.wdf.sap.corp
9838ec71db Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-04-27 14:09:40 +02:00
georg@lmy002.wdf.sap.corp
09a30f913b Merge lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0-build
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-04-27 14:07:58 +02:00
georg@lmy002.wdf.sap.corp
7d6c12313e fix for compile error (Windows) 2005-04-27 13:54:42 +02:00
msvensson@neptunus.(none)
e6293c49c4 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 13:30:00 +02:00
msvensson@neptunus.(none)
565e660bd4 Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
- Reverted removal of errorcheck mutex initialise, used in safe_mutex_init.
2005-04-27 13:29:37 +02:00
pem@mysql.com
0290afcdb7 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-04-27 13:24:40 +02:00
msvensson@neptunus.(none)
203cdde955 Merge from 4.1 to 5.0 2005-04-27 12:56:01 +02:00
msvensson@neptunus.(none)
6b84489a01 Bug#9263 GCC4: -mcpu is depricated, use -mtune or -march instead
- Made a script that selects the best compiler optimizations for the current cpu.
   - Use the script from BUILD/SETUP.sh
2005-04-27 12:50:37 +02:00
heikki@hundin.mysql.fi
af00b989df ha_innodb.cc:
Correct an assertion
2005-04-27 13:43:02 +03:00
heikki@hundin.mysql.fi
ab0dbb1fc6 ha_innodb.cc, mysqld.cc:
Fix compilation error if HAVE_REPLICATION is not defined
2005-04-27 13:36:58 +03:00
msvensson@neptunus.(none)
2627475a86 Merge neptunus.(none):/home/msvensson/mysql/bug9714
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 12:30:11 +02:00
msvensson@neptunus.(none)
30caa4a32d Merge neptunus.(none):/home/msvensson/mysql/bug8162
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:24:17 +02:00
heikki@hundin.mysql.fi
e93f8ec420 ha_innodb.cc:
Fix linking and compilation errors
2005-04-27 13:19:40 +03:00
msvensson@neptunus.(none)
b5e96531a7 Merge neptunus.(none):/home/msvensson/mysql/bug9954
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:19:18 +02:00
msvensson@neptunus.(none)
631f035ee9 Merge neptunus.(none):/home/msvensson/mysql/bug9911
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:17:07 +02:00
msvensson@neptunus.(none)
62473cce91 Merge neptunus.(none):/home/msvensson/mysql/bug2596
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:10:19 +02:00
msvensson@neptunus.(none)
c12ee8dc16 BUG#9714 libsupc++ problem
- Remove linking of libsupc++
 - Move all local static variables to filescope
2005-04-27 11:25:08 +02:00
msvensson@neptunus.(none)
81c5cd8aed Bug #8162 MySQL cannot be compiled without readline
- Display error if system readline or libedit can't be found
2005-04-27 11:19:00 +02:00
msvensson@neptunus.(none)
f3c72cc891 Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
- Changed makelist.sh
  - Bump up required version of autoconf
  - Use new style to init mutex in my_thr_init
2005-04-27 09:59:12 +02:00
joreland@mysql.com
d6f80c436c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-27 07:56:37 +02:00
heikki@hundin.mysql.fi
36c1766f5d sql_repl.cc:
Remove printf's from semi-sync code in sql_repl.cc
2005-04-27 03:18:54 +03:00
heikki@hundin.mysql.fi
9eadf2366c Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-27 03:02:25 +03:00
heikki@hundin.mysql.fi
d694d5f1c9 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-27 02:59:05 +03:00
heikki@hundin.mysql.fi
bea92e1646 dict0dict.c, dict0dict.h, fil0fil.c:
Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
2005-04-27 02:57:19 +03:00
jimw@mysql.com
fe8d8aca18 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-26 10:30:27 -07:00
jimw@mysql.com
64f8ebc68b Merge mysql.com:/home/jimw/my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-26 10:29:58 -07:00
joerg@mysql.com
af59b7502b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-26 19:26:51 +02:00
joerg@mysql.com
f0a5615383 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/nptl-4.1 2005-04-26 19:22:43 +02:00
joerg@mysql.com
d461d05e8b Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/merge-5.0 2005-04-26 19:18:05 +02:00
joerg@mysql.com
c45a942dc7 Merge of parallel fixes in 4.1 and 5.0 2005-04-26 19:16:18 +02:00
joerg@mysql.com
a0cac19e6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-04-26 19:11:54 +02:00
pem@mysql.comhem.se
406ea35128 Fixed memory leak in Item_func_sp::cleanup(). 2005-04-26 18:18:41 +02:00
jimw@mysql.com
6f95cf02ab Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-26 08:56:29 -07:00