mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25026 commits 2791 branches 343 tags 1.7 GiB
Commit graph

25026 commits

This branch
This branch
All branches
Author SHA1 Message Date
jimw@mysql.com
71a0d0ad4c Make lowercase_table3 get skipped on Windows, as intended. (Bug #11568) 2005-08-02 15:58:41 -07:00
lenz@mysql.com
2889025acc Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-08-02 14:04:21 +02:00
lenz@mysql.com
9217c90a77 - Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list all 
required commands/packages so the installation succeeds. Removed the superflouus
  Requires field from the source RPM.
 2005-08-02 13:59:02 +02:00
jimw@mysql.com
fb903c1e2c Fix two test results that were merged out-of-order. 2005-08-01 19:21:56 -07:00
jimw@mysql.com
48d111c8c2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-01 17:54:57 -07:00
jimw@mysql.com
ca56883011 Merge mysql.com:/home/jimw/my/mysql-4.1-9947 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:12:30 -07:00
jimw@mysql.com
c3e40306b7 Merge mysql.com:/home/jimw/my/mysql-4.1-11402 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:11:49 -07:00
jimw@mysql.com
9a5560683f Merge mysql.com:/home/jimw/my/mysql-4.1-10724 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-01 17:10:35 -07:00
jimw@mysql.com
8d591d0189 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-01 17:08:38 -07:00
jimw@mysql.com
4cf8696eae Fix crash in 'INSERT DELAYED' statement that failed due to a 
conflict in a unique key. (Bug #12226)
 2005-08-01 17:00:03 -07:00
jimw@mysql.com
ea7df08c93 Fix crash in 'SHOW CREATE FUNCTION' introduced by Monty's last 
cleanup.
 2005-08-01 15:43:40 -07:00
sasha@asksasha.com
3055ce9ecc Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1
 2005-08-01 13:34:04 -06:00
mskold@mysql.com
5d3b406799 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-01 12:05:52 +02:00
mskold@mysql.com
cc62018ff6 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-release 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-08-01 11:52:07 +02:00
mskold@mysql.com
0f0fb8a05a Fixed handling of NOT LIKE after Item_func::NOTLIKE_FUNC has been removed 2005-08-01 11:50:43 +02:00
schwenke@alpha.xl.local
655a86a9e7 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
 2005-08-01 08:34:29 +02:00
monty@mishka.local
7f845036c0 After merge fixes 
Review of new pushed code
 2005-07-31 22:56:24 +03:00
mskold@mysql.com
d969a9ab68 Fix for bug#12021 2005-07-31 21:33:46 +02:00
monty@mishka.local
585da2f6fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-31 21:09:18 +03:00
schwenke@alpha.xl.local
84c5ce61c5 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
 2005-07-31 19:59:20 +02:00
igor@rurik.mysql.com
da33db7558 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-07-31 04:33:15 -07:00
igor@rurik.mysql.com
9ee6e8c147 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-07-31 04:29:34 -07:00
igor@rurik.mysql.com
620f865cbb null_key.result, null_key.test: 
Modified test case for bug #12144.
 2005-07-31 04:28:01 -07:00
monty@mishka.local
e73d6c25fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-31 12:56:02 +03:00
monty@mishka.local
8437e9c1be Fixes during review of new pushed code 
Change bool in C code to my_bool
Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests
Added comparison of LEX_STRING's and use this to compare file types for view and trigger files.
 2005-07-31 12:49:55 +03:00
igor@rurik.mysql.com
f4c1b3bae4 Merge 2005-07-31 02:44:18 -07:00
igor@rurik.mysql.com
f8375c6cb3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2005-07-31 02:36:21 -07:00
igor@rurik.mysql.com
fea0fb2c8b Fixed bug #12095: a join query with GROUP_CONCAT over a single row table. 
If GROUP_CONCAT is calculated we always put its argument into a temp
table, even when the argument is a constant item.
 2005-07-31 02:32:33 -07:00
igor@rurik.mysql.com
37212c07ad Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-07-31 00:39:34 -07:00
bell@sanja.is.com.ua
fddd143b3a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
 2005-07-30 09:27:00 +03:00
bell@sanja.is.com.ua
ec3396aab3 postmerge-fix 2005-07-30 09:24:51 +03:00
sasha@asksasha.com
fa7897c62a updates for BUG#10780 - fixed slave I/O thread running status to No while attempting 
to connect
 2005-07-29 21:00:28 -06:00
georg@lmy002.wdf.sap.corp
8fecc1718e Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-07-30 00:10:16 +02:00
bell@sanja.is.com.ua
4a0d64af89 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
 2005-07-29 23:43:07 +03:00
bell@sanja.is.com.ua
36f250a240 Added sql_mode saving to mysql_dump (BUG#5891, part 2) 2005-07-29 23:39:08 +03:00
jimw@mysql.com
4bef050cd4 Merge mysql.com:/home/jimw/my/mysql-5.0-10351 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-29 09:25:11 -07:00
georg@lmy002.wdf.sap.corp
7344bae480 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-07-29 16:11:49 +02:00
schwenke@alpha.xl.local
4344cd39e0 fixed two bugs that break Windows build 2005-07-29 15:40:39 +02:00
georg@lmy002.wdf.sap.corp
10615d54fb fix for bug#12665 
macro floatget was missing in config-win.h
 2005-07-29 14:51:08 +02:00
lenz@mysql.com
c36a0fa5ac - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctype-cp932.c 
(thanks to JoergB for spotting it)
 2005-07-29 12:37:27 +02:00
hf@deer.(none)
ceb75aed65 Fix for bug #12173 (show create table crash) 2005-07-29 14:39:11 +05:00
igor@rurik.mysql.com
b66ebe504c Manual merge 2005-07-28 21:29:45 -07:00
igor@rurik.mysql.com
64e53ec5c4 Manual merge 2005-07-28 21:28:20 -07:00
igor@rurik.mysql.com
a5f2c7528c func_gconcat.result, func_gconcat.test: 
Added a test case for bug #12095.
sql_class.h:
  Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
  Added a flag to the TMP_TABLE_PARAM class forcing to put constant
  items generated after elimination of a single row table into temp table
  in some cases (e.g. when GROUP_CONCAT is calculated over a single row
  table).
  bk ci sql/item_sum.cc
  Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
  If GROUP_CONCAT is calculated we always put its argument into a temp
  table, even when the argument is a constant item.
sql_select.cc:
  Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
  If temp table is used to calculate GROUP_CONCAT the argument should
  be always put into this table, even when it is a constant item.
 2005-07-28 19:11:29 -07:00
monty@mysql.com
e60d786dde Ensure we free all items for prepared statements 
Before the fix in ~Prepared_statments we got a memory leak when executing mysql_client_test.test
Note that test 'variables.test' fails.
This will be fixed when Jimw pushes the fix for Bug 10351
 2005-07-29 05:06:35 +03:00
monty@mysql.com
16853d5f14 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-07-29 04:41:14 +03:00
sergefp@mysql.com
e5ba8ba521 Remove Item_func::NOTLIKE_FUNC and all [dead] code that uses it 2005-07-29 03:37:06 +02:00
jimw@mysql.com
90924fcb6a Fix for handling of unsigned long options on 32-bit platforms that 
allowed unintended overflows. (Bug #10351)
 2005-07-28 18:22:49 -07:00
sasha@asksasha.com
0abc5c941d testcase for bug 10780 was not added in the previous commit 2005-07-28 19:10:49 -06:00
sasha@asksasha.com
08faad4a4b patch for bug 10780 2005-07-28 19:08:01 -06:00