database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Code Activity
62,929 Commits 3,280 Branches 1,098 Tags
c7fc8045cb15f7edc587b133337aa28bc1dd9cc5
Commit Graph

26958 Commits

Author SHA1 Message Date
gkodinov/kgeorge@magare.gmz
4a6efcd664 Bug #26537: item_unhex() was not expected 
to return NULL for non-NULL arguments.
This is not the case as it can return NULL
for invalid hexidecimal strings.
Fixed by setting the maybe_null flag.
 2007-03-02 12:14:50 +02:00
rafal@quant.(none)
d445d5e4cc Removing global events_till_disconnect variable as it is replaced by a member of 
master info structure.
 2007-03-02 10:35:04 +01:00
malff/marcsql@weblab.(none)
2b1a04e7b9 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-26093
 2007-03-01 20:08:58 -07:00
malff/marcsql@weblab.(none)
6cf49ef065 Manual merge 2007-03-01 20:04:49 -07:00
malff/marcsql@weblab.(none)
ad45f0168d Bug#26093 (SELECT BENCHMARK() for SELECT statements does not produce valid 
results)

Before this fix, the function BENCHMARK() would fail to evaluate expressions
like "(select avg(a) from t1)" in debug builds (with an assert),
or would report a time of zero in non debug builds.

The root cause is that evaluation of DECIMAL_RESULT expressions was not
supported in Item_func_benchmark::val_int().

This has been fixed by this change.
 2007-03-01 19:20:47 -07:00
malff/marcsql@weblab.(none)
cb1cba9e77 Missing parameter to DBUG_PRINT 2007-03-01 18:14:51 -07:00
malff/marcsql@weblab.(none)
86c6eb7089 Fixed compiler warnings 2007-03-01 16:39:00 -07:00
evgen@moonbone.local
44f97f3f50 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/25122-bug-5.0-opt-mysql
 2007-03-02 00:10:25 +03:00
evgen@moonbone.local
11588e5e4a Bug#25122: Views based on a self-joined table aren't insertable. 
When INSERT is done over a view the table being inserted into is 
checked to be unique among all views tables. But if the view contains
self-joined table an error will be thrown even if all tables are used under
different aliases.

The unique_table() function now also checks tables' aliases when needed.
 2007-03-02 00:09:22 +03:00
malff/marcsql@weblab.(none)
df5c5aea23 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
 2007-03-01 14:06:57 -07:00
malff/marcsql@weblab.(none)
e46083c9cf Manual merge of 5.1 into 5.1-runtime 2007-03-01 13:47:28 -07:00
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
rafal@quant.(none)
ffc6c262a0 Merge rsomla@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl
 2007-03-01 16:32:57 +01:00
lars/lthalmann@mysql.com/dl145k.mysql.com
e71dbbd54e Post-merge fix 2007-03-01 16:17:48 +01:00
lars/lthalmann@dl145k.mysql.com
17d00e3c6b Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-03-01 15:39:57 +01:00
bar@mysql.com
8bbb520891 After merge fix 2007-03-01 18:16:17 +04:00
msvensson@pilot.blaudden
51a71fb667 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-03-01 14:53:32 +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
bar@mysql.com
20d2f414c5 Merge mysql.com:/home/bar/mysql-5.0.merge 
into  mysql.com:/home/bar/mysql-5.1-rpl
 2007-03-01 16:06:29 +04:00
rafal@quant.(none)
00e6bf6e73 Fixing manual merge error. 2007-03-01 11:52:20 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2f5a2b2476 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-03-01 11:37:28 +01:00
jamppa@bk-internal.mysql.com
87e7afe541 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
 2007-03-01 10:47:30 +01:00
rafal@quant.(none)
536d857d95 Removing two more compilation warnings. 2007-03-01 10:40:48 +01:00
rafal@quant.(none)
9c950bca95 Merge quant.(none):/ext/mysql/bk/mysql-5.0-bug25306 
into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl
 2007-03-01 10:03:42 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
ff5376986f Disabled compiler warnings. 2007-03-01 10:52:25 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
82b024e6af mysqld.cc: 
fix profiling_history_size type
 2007-03-01 09:38:09 +01:00
rafal@quant.(none)
dc6e9d7fc3 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl 
into  quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
 2007-03-01 08:47:49 +01:00
rafal@quant.(none)
8aee1f6e89 Fixes of compilation warnings and errors. 2007-03-01 08:41:13 +01:00
malff/marcsql@weblab.(none)
dc98aa82ab Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
 2007-02-28 18:14:56 -07:00
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
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
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
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb Fixed compiler warnings. 2007-02-28 22:23:35 +02: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
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
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
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
gluh@mysql.com/eagle.(none)
2baf35b4fa added initialization of 'cmp_type' variable(to remove compiler warning) 2007-02-28 15:44:57 +04:00
msvensson@pilot.blaudden
d3a12073f9 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-02-28 11:21:54 +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
gluh@eagle.(none)
be248ad0e0 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-02-28 13:26:20 +04:00
gluh@mysql.com/eagle.(none)
f1f0de8419 valgrind error fix 2007-02-28 13:25:49 +04: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