database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Code Activity
38,183 Commits 3,268 Branches 1,096 Tags
e854d43af9e70a28cd896e02bd28bbea9b2e8519
Commit Graph

14166 Commits

Author SHA1 Message Date
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-03-01 18:12:56 +01:00
malff/marcsql@weblab.(none)
14e1ed367e Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-4.1-runtime
 2007-03-01 05:59:16 -07:00
msvensson@pilot.blaudden
61140f0446 Bug#25262 Auto Increment lost when changing Engine type 
- Try to copy the autoincrement value when altering the table
 2007-03-01 13:43:04 +01:00
msvensson@pilot.blaudden
c1f8e7f913 MySQL versions before 5.0 still use cygwin, no need 
to convert path
 2007-03-01 11:41:29 +01:00
bar@mysql.com
c75a0d6a17 Fix for wrong replace command. 2007-03-01 12:26:07 +04:00
rafal@quant.(none)
7825a45e1c Merge quant.(none):/ext/mysql/bk/mysql-5.0-bug25463 
into  quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
 2007-03-01 09:23:26 +01:00
bar@mysql.com
272446dfcd Renaming recenly added test case, because of name conflict 
when merging into 5.1.
 2007-03-01 11:52:25 +04:00
bar@mysql.com
08d2203077 Additional fix for bug N 15126 
Replacing local directory.
 2007-03-01 11:23:12 +04:00
lars/lthalmann@mysql.com/dl145k.mysql.com
12e9464b5a Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-02-28 22:30:40 +01:00
msvensson@pilot.blaudden
3648941ecc Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 16:45:41 +01:00
msvensson@pilot.blaudden
6fac51be9f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 16:40:03 +01:00
msvensson@pilot.blaudden
b0ab925389 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 16:39:26 +01:00
svoj@mysql.com/june.mysql.com
aae6e1aba4 BUG#26238 - inserted delayed always inserts 0 for BIT columns 
INSERT DELAYED inserts garbage for BIT columns.

When delayed thread clones TABLE object, it didn't adjusted bit_ptr
to newly created record (though it correctly adjusts ptr and null_ptr).

This is fixed by correctly adjusting bit_ptr when performing a clone.
With this fix BIT values are stored correctly by INSERT DELAYED.
 2007-02-28 18:34:35 +04:00
bar@mysql.com
3c3964359d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b24478
 2007-02-28 18:21:00 +04:00
msvensson@pilot.blaudden
fb36bf9562 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Null merge 4.1 patch
 2007-02-28 15:15:38 +01:00
bar@mysql.com
233d4fb214 Additional test changes for 
Bug N 15126 character_set_database is not replicated (LOAD DATA INFILE need it)
Positions of some binlog events were changed because of
additional logging of @@collation_database.
 2007-02-28 18:13:23 +04:00
msvensson@pilot.blaudden
05ed84a3d2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
 2007-02-28 15:04:20 +01:00
msvensson@pilot.blaudden
3fc549d430 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Build lib/init-db.sql from the output of mysql_create_system_tables
 - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
 - Leave netware/init_db.sql until 5.0 where we should soon have possibility
   to test with mysql-test-run.pl
 2007-02-28 15:03:47 +01:00
bar@mysql.com
c48a5e8bd1 After merge fix 2007-02-28 17:32:18 +04:00
msvensson@pilot.blaudden
e391b86fb0 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Split out initial data in mysql_system_tables.sql to  it's own file
 - Use file from mysql_install_db and mysql-test-run
 2007-02-28 14:26:58 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d966a8ebd4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b25834/b25834.5.0
 2007-02-28 17:18:19 +04:00
bar@mysql.com
7e38927a38 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b15126
 2007-02-28 17:17:06 +04:00
bar@mysql.com
dd0c43d5fa Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it) 
This patch fixes problem that LOAD DATA could use different
character sets when loading files on master and on slave sides:
- Adding replication of thd->variables.collation_database
- Adding optional character set clause into LOAD DATA

Note, the second way, with explicit CHARACTER SET clause
should be the recommended way to load data using an alternative
character set.
The old way, using "SET @@character_set_database=xxx" should be
gradually depricated.
 2007-02-28 17:06:57 +04:00
msvensson@pilot.blaudden
6ea41f355c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 13:47:59 +01:00
msvensson@pilot.blaudden
c0da93cd97 When using a --mem=<dir> the memdir must be removed to assure 
afresh start
 2007-02-28 13:47:41 +01:00
msvensson@pilot.blaudden
44c56e35b6 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 11:21:29 +01:00
msvensson@pilot.blaudden
3a11b2be7e Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 10:53:06 +01:00
msvensson@pilot.blaudden
44959af241 Bug#26416 mysql-test-run exits with "Hangup" when piped to grep 
- Thanks to Christian for the patch!
 2007-02-28 10:52:51 +01:00
msvensson@pilot.blaudden
0df3d939b1 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 10:39:12 +01:00
msvensson@pilot.blaudden
3393c1e489 Bug#26686 mysql-test-run.pl aborts when waitpid returns -1 
- Add error handling for waitpid returns -1 for "simple run of command"
 2007-02-28 10:37:32 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
08431e7865 Merge mysql.com:/home/ram/work/b26038/b26038.4.1 
into  mysql.com:/home/ram/work/b26038/b26038.5.0
 2007-02-28 12:13:46 +04:00
msvensson@pilot.blaudden
14cfc7e1ba Merge pilot.blaudden:/home/msvensson/mysql/bug20166/my50-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-27 14:54:33 +01:00
bar@mysql.com
75177d9cf8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-5.0.b24478
 2007-02-27 12:46:50 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
fe8b1495f3 Fix for bug #25834: Test failure in "func_group" 
Round the results of std() for some calls with double arguments
to avoid double math precision problems.
 2007-02-27 11:01:58 +04:00
cbell/Chuck@mysql_cab_desk.
e9481608c3 Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
 2007-02-26 14:30:44 -05:00
msvensson@pilot.blaudden
eb135547eb Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-26 14:56:23 +01:00
msvensson@pilot.blaudden
23b6b4a565 Only allow a version number to be read from "/etc/debian_version" 2007-02-26 14:52:51 +01:00
gluh@mysql.com/eagle.(none)
e8635ad3cb Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-02-26 16:57:45 +04:00
bar@mysql.com
8f97dea5f8 Bug#24478 DROP TRIGGER is not caught by replicate-*-table filters 
Problem: DROP TRIGGER was not properly handled in combination
with slave filters, which made replication stop
Fix: loading table name before checking slave filters when
dropping a trigger.
 2007-02-26 15:25:43 +04:00
msvensson@pilot.blaudden
c550a45522 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Use mysql_system_tables.sql to create MySQL system tables in
   all places where we create them(mysql_install_db, mysql-test-run-pl
   and mysql_fix_privilege_tables.sql)
 2007-02-26 11:49:24 +01:00
msvensson@pilot.blaudden
1770993db7 Use binary file mode when writing the modified .TRG file to avoid CR/LF's being added on windows 2007-02-26 09:24:03 +01:00
msvensson@pilot.blaudden
5068ef8854 Workaround non portable use of "grep" and "cut" by loading the whole processlist 
into temporary table and selecting the correct row with SQL
 2007-02-26 09:16:22 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
1a09fb81fc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-02-25 00:10:51 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
1777f04e39 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-02-24 11:41:31 +01:00
anozdrin/alik@booka.opbmk
2da113129a IM test suite fix. 
Log messages from shell-scripts were put to var/log/<test id>.log
file. Now, this file is used by mysql-test-run.pl. So, move log
messages to var/log/<test id>.script.log.
 2007-02-24 13:12:20 +03:00
anozdrin/alik@booka.opbmk
77079d385d Fix shutdown delay option name according to The Manual. 2007-02-24 13:10:04 +03:00
msvensson@pilot.blaudden
e4700df9ed Replace non portable system commmands in trigger-grant 2007-02-24 08:18:57 +01:00
anozdrin/alik@alik.opbmk
90115eac42 Fix mysql-test-run.pl: IM in 5.0 uses old incorrect 
'shutdown_delay' option name.
 2007-02-23 21:51:33 +03:00
anozdrin/alik@alik.opbmk
a9e8d461e3 Fix result file. 2007-02-23 21:13:21 +03:00
cbell/Chuck@mysql_cab_desk.
9017512bd6 Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_20141
 2007-02-23 13:00:08 -05:00