mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43812 commits 2793 branches 343 tags 1.5 GiB
Commit graph

43812 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars/lthalmann@dl145k.mysql.com
504b4d2dfb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-02-28 22:32:44 +01:00
kent@mysql.com/kent-amd64.(none)
904972ceee Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-02-28 22:31:58 +01:00
kent@mysql.com/kent-amd64.(none)
4bddd1f6ca Makefile.am: 
EXCEPTIONS-CLIENT is now static part of repository
 2007-02-28 22:30:50 +01: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
3110418d6f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 22:27:17 +01:00
kent@kent-amd64.(none)
12988e699b Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-02-28 22:26:54 +01:00
kostja@bodhi.local
8b07431927 Remove dead code: flush_version was never increased in the server, 
therefore the logic associated with it never worked.
 2007-03-01 00:25:50 +03:00
kent@mysql.com/kent-amd64.(none)
de51325735 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-02-28 22:14:45 +01:00
kent@mysql.com/kent-amd64.(none)
444072f299 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-02-28 22:13:35 +01:00
kent@mysql.com/kent-amd64.(none)
f471a67fa6 Makefile.am: 
EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
 2007-02-28 22:09:09 +01:00
msvensson@pilot.blaudden
45fde92fb3 Bug #25074 mysql_upgrade test can't give consistent results 
- Remove from disabled list
 - Update test result
 2007-02-28 21:29:14 +01:00
kent@kent-amd64.(none)
2e39585c16 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-02-28 21:28:01 +01:00
kent@kent-amd64.(none)
1ac7b21717 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-02-28 21:24:11 +01:00
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb Fixed compiler warnings. 2007-02-28 22:23:35 +02:00
msvensson@pilot.blaudden
ab61d07a30 Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-28 21:21:37 +01:00
kent@mysql.com/kent-amd64.(none)
9a48ef3a06 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-02-28 21:20:57 +01:00
kent@mysql.com/kent-amd64.(none)
1fad124e01 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-02-28 21:19:19 +01:00
msvensson@pilot.blaudden
dd710c17ec Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074 
into  pilot.blaudden:/home/msvensson/mysql/bug25074/my51-bug25074-new
 2007-02-28 21:19:12 +01:00
msvensson@pilot.blaudden
cc7e77c5fd Bug #25074 mysql_upgrade test can't give consistent results 
- Tell the programs executed by mysql_upgrade to only read
  from the defaults file generated by msyql_upgrade
 - Fix memory leaks
 2007-02-28 21:05:39 +01:00
msvensson@pilot.blaudden
d56d34805c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 20:45:07 +01:00
msvensson@pilot.blaudden
0b4598a4b3 Bug #20166 mysql-test-run.pl does not test system privilege tables creation 
- No .sql files in mysql-test/lib/ anymore, don't copy them
 2007-02-28 20:44:49 +01:00
msvensson@pilot.blaudden
bfb417533a Bug#20166 mysql-test-run.pl does not test system privilege tables creation 
- Additional fixes caused by running without anonymous users
 2007-02-28 20:33:59 +01:00
joerg@trift2.
91c4030c8a Merge trift2.:/MySQL/M50/upward-5.0 
into  trift2.:/MySQL/M51/merge-5.1
 2007-02-28 18:05:22 +01:00
msvensson@pilot.blaudden
400a58e9c8 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:46:30 +01:00
msvensson@pilot.blaudden
bb88d4a2b1 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:45:54 +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
9591b9e922 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:41:30 +01:00
msvensson@pilot.blaudden
162f0803bb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 16:40:50 +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
msvensson@pilot.blaudden
b6fd729beb Merge pilot.blaudden:/home/msvensson/mysql/bug24878/my41-bug24878 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-28 16:38:31 +01:00
msvensson@pilot.blaudden
6ca22c6672 Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages 
- Add printout of current time when mysqld is killed by an
   unhandled signal
 2007-02-28 16:37:50 +01: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
msvensson@pilot.blaudden
3fc963f169 Bug#20166 mysql-test-run.pl does not test system privilege tables creation 2007-02-28 14:58:19 +01:00
msvensson@pilot.blaudden
9cfd569174 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-28 14:41:57 +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
kostja@bodhi.local
7d98fb7e33 Add more comments to open_table and open_tables. No real changes. 2007-02-28 16:03:38 +03:00
msvensson@pilot.blaudden
f63240f901 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 13:48:43 +01: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
gluh@mysql.com/eagle.(none)
2baf35b4fa added initialization of 'cmp_type' variable(to remove compiler warning) 2007-02-28 15:44:57 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1b83d62f41 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b25834/b25834.5.1
 2007-02-28 14:57:05 +04:00