mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
25471 commits 2781 branches 343 tags 1.6 GiB
Commit graph

25471 commits

This branch
This branch
All branches
Author SHA1 Message Date
aivanov@mysql.com
df00bbc862 Merge mysql.com:/home/alexi/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-1
 2005-08-16 23:33:06 +04:00
aivanov@mysql.com
0a1fa93190 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 23:27:00 +04:00
aivanov@mysql.com
ed6cd805dc information_schema.test: 
Added a comment line for a test case used for bug #12301.
information_schema.result:
  Fixed some test cases results (bug #12301).
sql_show.cc:
  Fixed bug #12301.
  The bug was due to a missing value setting for the NUMERIC_SCALE column
   in the get_schema_column_record() function (sql_show.cc).
 2005-08-16 23:11:04 +04:00
andrey@lmy004.
41c93e368b Merge lmy004.:/work/mysql-5.0-clean 
into lmy004.:/work/mysql-5.0-bug12595
 2005-08-16 20:59:18 +02:00
andrey@lmy004.
7269045b82 after review fix for bug #12595 2005-08-16 20:54:53 +02:00
kent@mysql.com
cb03a7b821 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-08-16 19:53:39 +02:00
kent@mysql.com
9457373c5f mtr_process.pl: 
Bug#12094: Let sleep_until_file_created() return the pid as intended
 2005-08-16 19:49:43 +02:00
kent@mysql.com
6ffe45c54e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-08-16 19:00:22 +02:00
andrey@lmy004.
a7a762e27d fix for bug #12595 (Escape character has to be exactly one) 2005-08-16 15:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
c7bdc5bb12 Fixed indentations in error and warning messages. 2005-08-16 15:32:41 +03:00
aivanov@mysql.com
246c0e687c Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 15:35:39 +04:00
andrey@lmy004.wdf.sap.corp
41e7178b77 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.wdf.sap.corp:/work/mysql-5.0-clean
 2005-08-16 11:22:29 +02:00
andrey@lmy004.wdf.sap.corp
c896ca1a10 fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar" 
(after review commit)
 2005-08-16 11:18:35 +02:00
stewart@mysql.com
69b671055f Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-08-16 18:59:10 +10:00
stewart@mysql.com
c7a8707f1f Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 
into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538
 2005-08-16 18:33:04 +10:00
igor@rurik.mysql.com
c5ac7e8d95 Manual merge 2005-08-15 21:58:17 -07:00
igor@rurik.mysql.com
d553e16518 subselect.result: 
Added missing drop statement
subselect.test:
  Added missing drop statement.
 2005-08-15 21:43:46 -07:00
igor@rurik.mysql.com
9693dc6a6b sql_select.cc: 
Fixed bug #11479.
  The JOIN::reinit method cannot call setup_tables
  after the optimization phase since this function
  removes some optimization settings for joined
  tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
  Added a test case for bug #11479.
 2005-08-15 21:33:58 -07:00
jimw@mysql.com
68d5420d7c Clean up merge from 4.1 2005-08-15 14:19:56 -07:00
aivanov@mysql.com
405f03f389 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/mysql-5.0
 2005-08-16 00:03:50 +04:00
jimw@mysql.com
2d34276417 Merge mysql.com:/home/jimw/my/mysql-5.0-12318 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:39:36 -07:00
jimw@mysql.com
55eebfb776 Merge mysql.com:/home/jimw/my/mysql-5.0-10627 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:38:56 -07:00
jimw@mysql.com
a3eaf4eec2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-15 12:37:45 -07:00
evgen@moonbone.local
69319f17e7 Fix bug #10624 Views with multiple UNION and UNION ALL produce incorrect 
results.

st_select_lex_unit::print() was losing UNION ALL if in statement were present
UNION DISTINCT.
 2005-08-15 23:05:05 +04:00
jimw@mysql.com
cd0f3596be Merge mysql.com:/home/jimw/my/mysql-4.1-11688 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 10:18:14 -07:00
monty@mysql.com
8589f14d45 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-15 20:12:28 +03:00
monty@mysql.com
c10f05552f Don't clear warnings for functions or triggers 
Fixed failing test
 2005-08-15 20:08:58 +03:00
jimw@mysql.com
233745a902 Merge mysql.com:/home/jimw/my/mysql-4.1-12235 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 10:03:36 -07:00
jimw@mysql.com
df25928983 Merge mysql.com:/home/jimw/my/mysql-4.1-11796 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 09:59:11 -07:00
jimw@mysql.com
e21a025c65 Merge mysql.com:/home/jimw/my/mysql-4.1-12327 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-08-15 09:58:05 -07:00
acurtis@xiphis.org
c414bb1520 Bug#12518 
"COLUMN_DEFAULT has wrong value if NOT NULL is set"
  Show NULL instead of empty string when no default value is set
 2005-08-15 17:14:55 +01:00
lars@mysql.com
b6a65715d6 BUG#12542: Prevous patch was incorrect. This removed the patch. 2005-08-15 17:53:38 +02:00
monty@mysql.com
1a6f16edd9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-08-15 18:35:48 +03:00
monty@mysql.com
d0c66bbaa3 Fixed typo in error numbers 2005-08-15 18:29:51 +03:00
monty@mysql.com
df32f7d621 Save and clear run context before executing a stored function or trigger and restore it afterwards. 
This allows us to use statement replication with functions and triggers
The following things are fixed with this patch:
- NOW() and automatic timestamps takes the value from the main event for functions and triggers (which allows these to replicate with statement level logging)
- No side effects for triggers or functions with auto-increment values(), last_insert_id(), rand() or found_rows()
- Triggers can't return result sets

Fixes bugs:
#12480: NOW() is not constant in a trigger
#12481: Using NOW() in a stored function breaks statement based replication
#12482: Triggers has side effects with auto_increment values
#11587: trigger causes lost connection error
 2005-08-15 18:15:12 +03:00
lenz@mysql.com
4880d22b79 - Removed a non-fatal error when running the Mac OS X 10.4 PackageMaker: 
CFBundleShortVersionString in Info.plist may not include a version
  suffix like "-beta" (BUG#12584)
- Minor cleanup: removed two unused keys from Info.plist: IFMajorVersion
  and IFMinorVersion
 2005-08-15 15:44:56 +02:00
serg@sergbook.mysql.com
fb19be7d6d Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-08-15 12:07:36 +02:00
evgen@moonbone.local
6bb2d4d7a9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11864
 2005-08-15 14:01:42 +04:00
evgen@moonbone.local
85afb22ef1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-10802
 2005-08-15 13:34:47 +04:00
evgen@moonbone.local
5dc75a559d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/mysql-5.0-bug-11864
 2005-08-15 13:21:55 +04:00
evgen@moonbone.local
7fcb9cd599 Fix bug #10802 Index is not used if table using BDB engine on HP-UX 
HP-UX compiler was generating code which makes wrong conversion from double to
ulonglong which results in not using index in some cases.

Changed type cast operators odrer with which generated code makes proper 
conversion.
 2005-08-15 13:02:29 +04:00
serg@sergbook.mysql.com
d689d415b3 forgotten 'return' 2005-08-14 23:20:06 +02:00
serg@sergbook.mysql.com
0329190269 Merge bk-internal:/home/bk/mysql-5.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
 2005-08-14 14:11:59 +02:00
serg@sergbook.mysql.com
2870638ef2 client/mysql.cc 
mysql default port cleanup (it's set in libmysql.c, NOT in my_getopt)
configure.in
    autoconf 2.52 is enough to build mysql-5.0
 2005-08-14 14:06:47 +02:00
sanja@hasky.mysql.fi
562786bc36 table.cc: 
remove unneeded multitable_view assignment
sql_view.cc:
  fix potential memorry overrun in ref_array
  asssign multitable_view in time of view creation (BUG#12569)
 2005-08-13 17:06:30 +03:00
sanja@hasky.mysql.fi
1006063ef1 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  hasky.mysql.fi:/home/sanja/work-merge-5.0
 2005-08-13 11:16:26 +03:00
sanja@hasky.mysql.fi
2e2b897ff3 item_subselect.cc: 
postmerge fix
subselect.result:
  new 5.0 result (postmerge)
 2005-08-13 11:15:17 +03:00
serg@sergbook.mysql.com
135103bac1 after merge 2005-08-13 08:42:35 +02:00
sanja@hasky.mysql.fi
16d279bb12 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  hasky.mysql.fi:/home/sanja/work-merge-5.0
 2005-08-13 08:19:34 +03:00
bell@50.0.168.192.in-addr.arpa
8d7a364074 Merge 50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1 
into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1
 2005-08-13 07:49:22 +03:00