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
22268 commits 2784 branches 343 tags 1.6 GiB
Commit graph

22268 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
129c604032 Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598) 2005-04-30 03:14:42 +03:00
monty@mysql.com
215be0264b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-04-27 17:19:32 +03:00
monty@mysql.com
69b813a901 mysqladmin extended-status now displays global status 
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
 2005-04-27 17:16:08 +03: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
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
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
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
heikki@hundin.mysql.fi
e93f8ec420 ha_innodb.cc: 
Fix linking and compilation errors
 2005-04-27 13:19:40 +03: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
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
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
jimw@mysql.com
fcc04b2ffd Merge changes to acinclude.m4 that are now in config/ac-macros/misc.m4 2005-04-26 08:23:42 -07:00
jimw@mysql.com
ef5ad50ccc Merge mysql.com:/home/jimw/my/mysql-4.1-9063 
into mysql.com:/home/jimw/my/mysql-5.0-build
 2005-04-26 08:20:51 -07:00
jimw@mysql.com
a296ccfd28 Fix typo in include file name (Bug #9063) 2005-04-26 08:20:00 -07:00
heikki@hundin.mysql.fi
f12cd8c708 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-04-26 17:57:15 +03:00
ramil@mysql.com
5624641cb0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b9489
 2005-04-26 19:57:15 +05:00
jani@ua141d10.elisa.omakaista.fi
005c447183 Added a check for config-file. 2005-04-26 17:57:14 +03:00
jani@ua141d10.elisa.omakaista.fi
cdda50acbb Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-04-26 17:47:19 +03:00
ramil@mysql.com
db2b729c73 A fix (bug #10176: problem with varchar keys). 2005-04-26 19:46:52 +05:00
jani@ua141d10.elisa.omakaista.fi
c98b90bbfb Fixed Bug#9834, "mysqld_multi --config-file parameter requires 
absolute path".
 2005-04-26 17:46:43 +03:00
gbichot@quadita2.mysql.com
bc7856cd1e Merge quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
 2005-04-26 16:09:04 +02:00
gbichot@quadita2.mysql.com
a95571875c checking that statements get into binlog even when they were affecting 
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).
 2005-04-26 15:52:04 +02:00
jani@ua141d10.elisa.omakaista.fi
d4d0f9c126 Fixed Bug#6221, "mysqld_multi doesn't read the init_connect 
option in my.cnf correctly"
 2005-04-26 16:16:38 +03:00
jani@ua141d10.elisa.omakaista.fi
a82c7bea66 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-04-26 14:29:20 +03:00
jani@ua141d10.elisa.omakaista.fi
7810721f40 Fixed Bug#9835: mysqld_multi --help won't output help if there are 
parameter problems.
 2005-04-26 14:28:22 +03:00
joerg@mysql.com
74fdb2663c Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497). 2005-04-26 13:15:20 +02:00
ramil@mysql.com
cfa24e3d64 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/mysql-5.0
 2005-04-26 16:02:17 +05:00
jani@ua141d10.elisa.omakaista.fi
0ca934de63 Improved client internal help. 
Doc fix for Bug#9870.
 2005-04-26 14:02:16 +03:00
ramil@mysql.com
12d14eb96c Test case (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:48:16 +05:00
ramil@mysql.com
7882cd32bc A fix (bug #9756: mysql client failing on dumps containing certain \ sequences). 2005-04-26 15:43:20 +05:00
joerg@mysql.com
1523119091 Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 2005-04-26 12:16:12 +02:00
joerg@mysql.com
49ac2dac3e Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497). 
Post-merge fix will follow.
 2005-04-26 12:03:37 +02:00
jimw@mysql.com
93ff028f9d Fix compile issues in Intel C/C++ compiler (Bug #9063) 2005-04-25 18:02:03 -07:00
sergefp@mysql.com
b890c05b4d Merge 5.0-build -> 5.0 : keep NDB_VERSION_BUILD=6 2005-04-26 02:24:37 +04:00
sergefp@mysql.com
a27e830385 BUG#10037: A proper fix: Add 0.01 to cost of 'range' scans, don't add 0.01 to cost of the 'index' scan. 2005-04-26 01:56:10 +04:00
reggie@mdk10.(none)
a22ec942ac regerror.c: 
Changed function signature to fix compile errors with Whidbey
 2005-04-25 16:53:47 -05:00
lenz@mysql.com
83c289665f - fixed NDB_VERSION_BUILD in configure.in to have the correct number (4->5) 2005-04-25 13:28:07 +02:00