database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-04 18:03:14 +03:00
Code
49,288 Commits 3,023 Branches 356 Tags
Commit Graph

15032 Commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
c2a2267ba1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-08-28 11:22:24 +02:00
tsmith@ramayana.hindu.god
2c44def1ee Bug #30389: connection_id() always return 0 in embedded server 
Initialize thd->variables.pseudo_thread_id when a new embedded
thd is created.
 2007-08-27 14:31:27 -06:00
gshchepa/uchum@gleb.loc
4a7fdf8611 Fixed bug #30396. 
Recommit to 5.1.22.
The bug caused memory corruption for some queries with top OR level
in the WHERE condition if they contained equality predicates and 
other sargable predicates in disjunctive parts of the condition.

The corruption happened because the upper bound of the memory
allocated for KEY_FIELD and SARGABLE_PARAM internal structures
containing info about potential lookup keys was calculated incorrectly
in some cases. In particular it was calculated incorrectly when the
WHERE condition was an OR formula with disjuncts being AND formulas
including equalities and other sargable predicates.
 2007-08-24 02:23:49 +05:00
tomas@whalegate.ndb.mysql.com
0c38530b82 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-08-23 15:15:35 +02:00
joerg@trift2.
36cba7ce09 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/target-5.1.22
 2007-08-22 15:49:00 +02:00
tomas@whalegate.ndb.mysql.com
88fa8c267b rpl_ndb_dd_partitions-slave.opt: 
Rename: mysql-test/t/rpl_ndb_dd_partitions-slave.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt
.del-rpl_stm_extraColmaster_ndb.result:
  Delete: mysql-test/r/rpl_stm_extraColmaster_ndb.result
.del-rpl_extraColmaster_myisam.test:
  Delete: mysql-test/t/rpl_extraColmaster_myisam.test
ndb_bug26793.result:
  Rename: mysql-test/r/ndb_bug26793.result -> mysql-test/suite/ndb/r/ndb_bug26793.result
.del-rpl_extraColmaster_innodb-slave.opt:
  Delete: mysql-test/t/rpl_extraColmaster_innodb-slave.opt
.del-rpl_extraColmaster_innodb-master.opt:
  Delete: mysql-test/t/rpl_extraColmaster_innodb-master.opt
.del-rpl_row_extraColmaster_ndb.test:
  Delete: mysql-test/t/rpl_row_extraColmaster_ndb.test
.del-rpl_row_extraColmaster_ndb.result:
  Delete: mysql-test/r/rpl_row_extraColmaster_ndb.result
.del-rpl_stm_extraColmaster_ndb.test:
  Delete: mysql-test/t/rpl_stm_extraColmaster_ndb.test
.del-rpl_extraColmaster_innodb.test:
  Delete: mysql-test/t/rpl_extraColmaster_innodb.test
ndb_bug26793.test:
  Rename: mysql-test/t/ndb_bug26793.test -> mysql-test/suite/ndb/t/ndb_bug26793.test
rpl_ndb_dd_partitions-master.opt:
  Rename: mysql-test/t/rpl_ndb_dd_partitions-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt
.del-rpl_colSize.test~d9690ba9ffd2b048:
  Delete: mysql-test/t/rpl_colSize.test
 2007-08-21 16:26:00 +02:00
tomas@whalegate.ndb.mysql.com
166849188d manual merge 2007-08-21 14:41:50 +02:00
jbruehe/mysqldev@mysql.com/production.mysql.com
7f21134826 Merge bk-internal:/home/bk/mysql-5.1-marvel 
into  mysql.com:/data0/mysqldev/my/build-200708161639-5.1.21-beta/mysql-5.1-release
 2007-08-16 21:56:47 +02:00
jbruehe/mysqldev@mysql.com/production.mysql.com
2d4efab366 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/data0/mysqldev/my/mysql-5.1-30367
 2007-08-16 18:21:47 +02:00
monty@mysql.com/narttu.mysql.fi
9b6b53f0d0 Fixed errors found by pushbuild: 
Fixed failing func_misc test for embedded server
Added casts to avoid compiler warnings
Removed Table_locks_immediate as it's depending on log file cacheing
Changed type of get_time() to avoid warnings
Removed testing if purger master logs succeded as this is not deterministic
 2007-08-16 16:47:31 +03:00
mskold/marty@linux.site
e688303f87 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-08-13 17:52:30 +02:00
mskold/marty@mysql.com/linux.site
06b3c9a8b8 bug#30337 DELETE ... WHERE PK IN (..) and AFTER DELETE trigger crashes API node: Added testcase 2007-08-13 15:59:08 +02:00
kostja@bodhi.(none)
9c72c3dfdb A fix for Bug#29049 lock_multi fails in rare case. 
The patch changes the test case only.
The fix is to replace all 'sleep's with wait_condition. This makes
the test deterministic and also ~300 times faster.
 2007-08-11 14:07:49 +04:00
kostja@bodhi.(none)
8f9168df53 A fix for Bug#30212 events_logs_tests not deterministic; SLEEP(2), others 
Make the test deterministic.
 2007-08-11 01:11:56 +04:00
gluh@mysql.com/eagle.(none)
b948d4a8f4 Bug#30310 wrong result on SELECT * FROM INFORMATION_SCHEMA.SCHEMATA WHERE .. 
1. added check to fill_schema_schemata() func.
   if we have db lookup value we should check that db exists
2. added check to get_all_tables() func
   if we have lookup db name or tables name values we shoud check that
   these values are not empty strings
3. fixed typo
 2007-08-09 20:41:26 +05:00
kostja@bodhi.(none)
3ecef8c0b9 A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system 2007-08-08 15:49:19 +04:00
kostja@bodhi.(none)
28f1f1828d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-08 11:36:55 +04:00
msvensson@pilot.(none)
59bebf2904 Bug#26793 mysqld crashes when doing specific query on information_schema 
- Drop the newly created user user1@localhost
 - Cleanup testcase
 2007-08-07 19:16:06 +02:00
dlenev@mockturtle.local
c3e3a5e188 Added test for bug #21281 "Pending write lock is incorrectly removed 
when its statement being KILLed". The bug itself was fixed by separate
patch in 5.0 tree.
 2007-08-05 13:55:37 +04:00
dlenev@mockturtle.local
ec2aeb4fae Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2
 2007-08-05 13:26:10 +04:00
df@pippilotta.erinye.com
f0f9652988 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-04 11:08:11 +02:00
iggy@amd64.(none)
64b6c61108 Merge amd64.(none):/src/mysql-5.1-maint 
into  amd64.(none):/src/mysql-5.1-build_29903
 2007-08-03 21:44:59 -04:00
iggy@amd64.(none)
171f402ad4 Bug#29903 The CMake build method does not produce the embedded library. 
- GCov fix.
 2007-08-03 21:08:48 -04:00
mkindahl@dl145h.mysql.com
92d4958eb7 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
 2007-08-03 19:04:59 +02:00
mkindahl@dl145h.mysql.com
ea9848094a Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
 2007-08-03 18:59:16 +02:00
df@pippilotta.erinye.com
493634e4c7 Merge bk-internal:/home/bk/mysql-5.1-marvel 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
 2007-08-03 17:15:23 +02:00
bar@bar.myoffice.izhnet.ru
fb8dff9721 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
 2007-08-03 17:16:02 +05:00
bar@bar.myoffice.izhnet.ru
c01ce7b1e3 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
 2007-08-03 15:30:31 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
4eebfd09c2 Bug#28875 Conversion between ASCII and LATIN1 charsets does not function 
(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.
 2007-08-03 15:25:23 +05:00
monty@mysql.com/nosik.monty.fi
237d586700 Simplify logging code a bit (to make code smaller and faster) 
Moved duplicated code to inline function store_timestamp()
Save thd->time_zone_used when logging to table as CSV internally cases it to be changed
Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables.
Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping
Set TABLE->no_replicate on open
 2007-08-03 01:14:27 +03:00
gluh@mysql.com/eagle.(none)
27ab885525 WL#3732 Information schema optimization 2007-08-03 03:14:05 +05:00
cbell/Chuck@mysql_cab_desk.
dc2cab6561 Merge mysql_cab_desk.:C:/source/c++/mysql-5.1 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
 2007-08-02 15:27:47 -04:00
ramil/ram@ramil.myoffice.izhnet.ru
0d9301585b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b30088/b30088.5.0
 2007-08-02 18:23:23 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
7512856c31 Merge mysql.com:/home/ram/work/b30088/b30088.5.0 
into  mysql.com:/home/ram/work/b30088/b30088.5.1
 2007-08-02 16:56:32 +05:00
kostja@bodhi.(none)
ea3388f2b2 Add a test case for Bug#5719 "impossible to lock VIEW". 
It has been possible to lock a view in 5.1 for some time.
 2007-08-02 13:59:02 +04:00
monty@nosik.monty.fi
93f0771fca Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-08-02 07:55:33 +03:00
tsmith@ramayana.hindu.god
a52a078f75 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:40:02 -06:00
tsmith@ramayana.hindu.god
534c3f325d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:39:13 -06:00
tsmith@ramayana.hindu.god
9ce717b0fe Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:15:24 -06:00
tsmith@ramayana.hindu.god
8575227571 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:14:50 -06:00
kostja@bodhi.(none)
d63d8cb1a3 Add a test case for Bug#18287 create federated table always times out, 
error 1159 ' ' (fixed by the patch for Bug 25679)
 2007-08-02 03:32:54 +04:00
kostja@bodhi.(none)
1c1abb4252 Fix an unstable test. 2007-08-01 16:48:14 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c5209fcbd0 Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0 
into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.1
 2007-08-01 15:31:20 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7fb417d0ba Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
restores from mysqlbinlog out

Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
result may differ from what was used when issuing the statement.

Fix: if there is a connection_id() in a statement, write to binlog
SET pseudo_thread_id= XXX; before it and use the value later on.
 2007-08-01 15:27:03 +05:00
kostja@bodhi.(none)
b89ff2fd6f Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-01 12:32:40 +04:00
kostja@bodhi.(none)
d0dc51b4f7 Fix an unstable test. It was reliant on the current time. 2007-08-01 12:28:08 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c62d7528c8 Fix for bug #30088: Can't disable myisam-recover by a value of "". 
- test result.

Problem: we don't proper handle "" value of the --myisam-recover option.

Fix: turn off myisam recovering if --myisam-recover="" is set.
 2007-08-01 11:41:13 +05:00
tsmith@ramayana.hindu.god
70e14610d6 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
 2007-07-31 17:36:19 -06:00
kostja@bodhi.(none)
6238763281 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-31 23:47:38 +04:00
kostja@bodhi.(none)
1bf318b895 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-31 20:03:52 +04:00