| 1 |
ChangeSet@1.2492, 2007-07-03 12:20:19-04:00, cmiller@zippy.cornsilk.net +2 -0 |
| 2 |
In 5.0, Field_double::val_str uses "%g" to render floating point |
| 3 |
numbers, which uses "X.YeZ" notation when the exponent Z would be |
| 4 |
less than -4. That behavior at -4 is not exactly what we want, and |
| 5 |
our Decimal type offers smarter number representation. By changing |
| 6 |
profiling to use Decimal types, we get more readable output. |
| 7 |
TAG: clone-5.0.45-build |
| 8 |
|
| 9 |
sql/sql_profile.cc@1.11, 2007-07-03 12:20:17-04:00, cmiller@zippy.cornsilk.net +25 -10 |
| 10 |
Change the DOUBLE I_S types to DECIMAL, so we get a smarter |
| 11 |
floating-point number renderer. |
| 12 |
|
| 13 |
sql/sql_show.cc@1.352, 2007-07-03 12:20:17-04:00, cmiller@zippy.cornsilk.net +9 -2 |
| 14 |
Add MYSQL_TYPE_DECIMAL as a string-ish type that INFORMATION_SCHEMA |
| 15 |
tables may use. |
| 16 |
|
| 17 |
ChangeSet@1.2491, 2007-07-03 11:25:32-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 18 |
Avoid a warning on windows about a missing case enum. |
| 19 |
|
| 20 |
sql/sql_parse.cc@1.602, 2007-07-03 11:25:30-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 21 |
Avoid a warning on windows. |
| 22 |
|
| 23 |
ChangeSet@1.2490, 2007-07-02 12:29:07-04:00, cmiller@zippy.cornsilk.net +3 -0 |
| 24 |
Merge fix-up. |
| 25 |
|
| 26 |
BitKeeper/deleted/.del-create_manifest.js@1.2, 2007-07-02 10:23:39-04:00, cmiller@zippy.cornsilk.net +0 -0 |
| 27 |
Delete: win/create_manifest.js |
| 28 |
|
| 29 |
BitKeeper/deleted/.del-mysql_manifest.cmake@1.2, 2007-07-02 10:28:17-04:00, cmiller@zippy.cornsilk.net +0 -0 |
| 30 |
Delete: win/mysql_manifest.cmake |
| 31 |
|
| 32 |
mysql-test/r/information_schema.result@1.126, 2007-07-02 12:29:04-04:00, cmiller@zippy.cornsilk.net +7 -7 |
| 33 |
Move the test down. |
| 34 |
|
| 35 |
ChangeSet@1.2425.1.53, 2007-07-02 07:27:39-04:00, cmiller@zippy.cornsilk.net +8 -0 |
| 36 |
Unify profiling SHOW code and INFORMATION_SCHEMA code for |
| 37 |
profiling. Also, |
| 38 |
|
| 39 |
Bug#26938: profiling client hang if used before enabled |
| 40 |
|
| 41 |
In the SHOW command, not sending header data because we had no |
| 42 |
rows to send was a protocol violation. Porting the SHOW PROFILE |
| 43 |
command to use the Information Schema table avoids that problem. |
| 44 |
|
| 45 |
mysql-test/r/profiling.result@1.6, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +4 -0 |
| 46 |
Add headers of pre-profile SHOW test. |
| 47 |
|
| 48 |
mysql-test/t/profiling.test@1.3, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +5 -0 |
| 49 |
Verify that the protocol isn't violated if we ask for profiling |
| 50 |
info before profiling has recorded anything. |
| 51 |
|
| 52 |
sql/sql_parse.cc@1.600, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +9 -17 |
| 53 |
Remove SQLCOM_SHOW_PROFILE and add a I_S schema table entry. |
| 54 |
|
| 55 |
sql/sql_profile.cc@1.10, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +95 -253 |
| 56 |
Add SHOW column-names and a new function that takes profile options |
| 57 |
set in the parser and packs a list of selected fields from the |
| 58 |
I_S table implementation. |
| 59 |
|
| 60 |
sql/sql_profile.h@1.6, 2007-07-02 07:27:23-04:00, cmiller@zippy.cornsilk.net +1 -6 |
| 61 |
Remove unused functions and add a new function. |
| 62 |
|
| 63 |
sql/sql_show.cc@1.345.2.2, 2007-07-02 07:27:24-04:00, cmiller@zippy.cornsilk.net +2 -1 |
| 64 |
Add a pointer to the function that selects fields from I_S table |
| 65 |
for SHOW command. |
| 66 |
|
| 67 |
sql/sql_yacc.yy@1.514.1.2, 2007-07-02 07:27:24-04:00, cmiller@zippy.cornsilk.net +7 -1 |
| 68 |
Prepare an I_S table for SHOW PROFILE. |
| 69 |
|
| 70 |
sql/table.h@1.142, 2007-07-02 07:27:24-04:00, cmiller@zippy.cornsilk.net +1 -1 |
| 71 |
Rename to match the intention. |
| 72 |
|
| 73 |
ChangeSet@1.2425.1.52, 2007-05-07 19:48:11+02:00, df@pippilotta.erinye.com +1 -0 |
| 74 |
raise version number |
| 75 |
|
| 76 |
configure.in@1.427, 2007-05-07 19:48:10+02:00, df@pippilotta.erinye.com +2 -2 |
| 77 |
raise version number |
| 78 |
|
| 79 |
ChangeSet@1.2425.1.51, 2007-05-07 08:25:47+02:00, df@pippilotta.erinye.com +1 -0 |
| 80 |
specfile fixes |
| 81 |
TAG: mysql-5.0.41 |
| 82 |
|
| 83 |
support-files/mysql.spec.sh@1.174, 2007-05-07 08:25:45+02:00, df@pippilotta.erinye.com +19 -14 |
| 84 |
specfile fixes |
| 85 |
|
| 86 |
ChangeSet@1.2425.1.50, 2007-05-04 09:46:33+02:00, df@pippilotta.erinye.com +1 -0 |
| 87 |
backport a manifest fix |
| 88 |
|
| 89 |
CMakeLists.txt@1.7.2.3, 2007-05-04 09:46:31+02:00, df@pippilotta.erinye.com +5 -0 |
| 90 |
backported fix |
| 91 |
|
| 92 |
ChangeSet@1.2425.1.48, 2007-04-30 14:22:38+02:00, dfischer@mysql.com +2 -0 |
| 93 |
create_manifest.js, mysql_manifest.cmake: |
| 94 |
add files for patch |
| 95 |
|
| 96 |
win/create_manifest.js@1.1, 2007-04-30 14:22:13+02:00, dfischer@mysql.com +85 -0 |
| 97 |
add files for patch |
| 98 |
|
| 99 |
win/create_manifest.js@1.0, 2007-04-30 14:22:13+02:00, dfischer@mysql.com +0 -0 |
| 100 |
|
| 101 |
win/mysql_manifest.cmake@1.1, 2007-04-30 14:22:19+02:00, dfischer@mysql.com +20 -0 |
| 102 |
add files for patch |
| 103 |
|
| 104 |
win/mysql_manifest.cmake@1.0, 2007-04-30 14:22:19+02:00, dfischer@mysql.com +0 -0 |
| 105 |
|
| 106 |
ChangeSet@1.2425.1.47, 2007-04-30 13:30:58+02:00, dfischer@mysql.com +1 -0 |
| 107 |
Makefile.am: |
| 108 |
fix typo |
| 109 |
|
| 110 |
win/Makefile.am@1.3.1.2, 2007-04-30 13:30:46+02:00, dfischer@mysql.com +1 -1 |
| 111 |
fix typo |
| 112 |
|
| 113 |
ChangeSet@1.2425.1.46, 2007-04-30 11:41:19+02:00, dfischer@mysql.com +10 -0 |
| 114 |
backport vista manifest patch |
| 115 |
|
| 116 |
CMakeLists.txt@1.7.2.1, 2007-04-30 11:41:04+02:00, dfischer@mysql.com +27 -0 |
| 117 |
backport vista manifest patch |
| 118 |
|
| 119 |
client/CMakeLists.txt@1.5.1.1, 2007-04-30 11:41:04+02:00, dfischer@mysql.com +14 -0 |
| 120 |
backport vista manifest patch |
| 121 |
|
| 122 |
extra/CMakeLists.txt@1.4.1.1, 2007-04-30 11:41:05+02:00, dfischer@mysql.com +7 -0 |
| 123 |
backport vista manifest patch |
| 124 |
|
| 125 |
libmysql/CMakeLists.txt@1.2.1.1, 2007-04-30 11:41:05+02:00, dfischer@mysql.com +5 -0 |
| 126 |
backport vista manifest patch |
| 127 |
|
| 128 |
myisam/CMakeLists.txt@1.2.1.1, 2007-04-30 11:41:05+02:00, dfischer@mysql.com +8 -0 |
| 129 |
backport vista manifest patch |
| 130 |
|
| 131 |
server-tools/instance-manager/CMakeLists.txt@1.2.1.1, 2007-04-30 11:41:05+02:00, dfischer@mysql.com +5 -0 |
| 132 |
backport vista manifest patch |
| 133 |
|
| 134 |
sql/CMakeLists.txt@1.7, 2007-04-30 11:41:08+02:00, dfischer@mysql.com +5 -0 |
| 135 |
backport vista manifest patch |
| 136 |
|
| 137 |
win/Makefile.am@1.3.1.1, 2007-04-30 11:41:08+02:00, dfischer@mysql.com +2 -1 |
| 138 |
backport vista manifest patch |
| 139 |
|
| 140 |
win/README@1.3.1.1, 2007-04-30 11:41:08+02:00, dfischer@mysql.com +2 -0 |
| 141 |
backport vista manifest patch |
| 142 |
|
| 143 |
win/configure.js@1.4.1.1, 2007-04-30 11:41:08+02:00, dfischer@mysql.com +1 -0 |
| 144 |
backport vista manifest patch |
| 145 |
|
| 146 |
ChangeSet@1.2392.105.27, 2007-04-20 14:01:49+02:00, df@pippilotta.erinye.com +1 -0 |
| 147 |
win32 build fix |
| 148 |
|
| 149 |
VC++Files/sql/mysqld.vcproj@1.13, 2007-04-20 14:01:48+02:00, df@pippilotta.erinye.com +3 -75 |
| 150 |
win32 build fix |
| 151 |
|
| 152 |
ChangeSet@1.2392.105.26, 2007-04-16 15:00:16-04:00, cmiller@zippy.cornsilk.net +2 -0 |
| 153 |
Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed |
| 154 |
|
| 155 |
Additional changes to test: "flush tables" so that Windows releases |
| 156 |
the files. |
| 157 |
|
| 158 |
mysql-test/r/mysqlcheck.result@1.5, 2007-04-16 15:00:13-04:00, cmiller@zippy.cornsilk.net +26 -1 |
| 159 |
Add "flush tables" to get windows to release the files, so that |
| 160 |
we can test truncation properly. |
| 161 |
|
| 162 |
mysql-test/t/mysqlcheck.test@1.6, 2007-04-16 15:00:13-04:00, cmiller@zippy.cornsilk.net +8 -0 |
| 163 |
Add "flush tables" to get windows to release the files, so that |
| 164 |
we can test truncation properly. |
| 165 |
|
| 166 |
ChangeSet@1.2392.105.25, 2007-04-10 16:47:07-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 167 |
Use platform-independent mysqltest language. |
| 168 |
|
| 169 |
mysql-test/t/mysqlcheck.test@1.5, 2007-04-10 16:47:06-04:00, cmiller@zippy.cornsilk.net +3 -2 |
| 170 |
Use platform-independent mysqltest language. |
| 171 |
|
| 172 |
ChangeSet@1.2392.105.24, 2007-04-06 09:15:18-04:00, cmiller@zippy.cornsilk.net +3 -0 |
| 173 |
Changing the state of whether we're recording profiling information |
| 174 |
halfway through a query (as happens in "SET SESSION PROFILING = ...") |
| 175 |
has a few side-effects, the worst of which is a memory leak for |
| 176 |
prepared statements, which poke directly from the parser into the |
| 177 |
profiling code (we don't have the query text when we need it) and |
| 178 |
that overwrites a pointer to heap-allocated memory when the previous |
| 179 |
statement turns on profiling. |
| 180 |
|
| 181 |
Instead, now set a flag when we begin a new statement that tracks |
| 182 |
whether profiling is on _at the start_ of the query. Use that to |
| 183 |
track whether we gather info. |
| 184 |
|
| 185 |
Additionally, use that AND use the state of the profiling variable |
| 186 |
after the end of a query to know whether to store information about |
| 187 |
the query that just finished. |
| 188 |
|
| 189 |
mysql-test/r/profiling.result@1.5, 2007-04-06 09:15:16-04:00, cmiller@zippy.cornsilk.net +126 -127 |
| 190 |
Testing whether profiling is on at the beginning of a query and at |
| 191 |
the end of a query makes "SET SESSION PROFILING = ..." statements |
| 192 |
disappear from the profiling. They were never reliable before. |
| 193 |
|
| 194 |
sql/sql_profile.cc@1.9, 2007-04-06 09:15:16-04:00, cmiller@zippy.cornsilk.net +15 -3 |
| 195 |
Check to see if profiling was enabled at the beginning of this query |
| 196 |
before trying to store query_source. This avoids a memory leak for |
| 197 |
prepared statements, which get here by direct means. |
| 198 |
|
| 199 |
If profiling was toggled in this query, then don't store this query |
| 200 |
profile. |
| 201 |
|
| 202 |
sql/sql_profile.h@1.5, 2007-04-06 09:15:16-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 203 |
Keep track of whether profiling is on. |
| 204 |
|
| 205 |
ChangeSet@1.2392.105.23, 2007-04-04 07:44:12-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 206 |
Backport: |
| 207 |
|
| 208 |
B-g#27427: resolveip fails on hostnames with a leading digit |
| 209 |
|
| 210 |
We need inet_aton for the extra/resolveip tool. Some OSes put this |
| 211 |
in nonstandard libraries. |
| 212 |
|
| 213 |
configure.in@1.425, 2007-04-04 07:44:10-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 214 |
We need inet_aton for the extra/resolveip tool. |
| 215 |
|
| 216 |
ChangeSet@1.2392.105.22, 2007-04-03 19:52:24-04:00, cmiller@zippy.cornsilk.net +2 -0 |
| 217 |
Unreported minor bug: We start numbering query IDs at zero, which |
| 218 |
is a special case in "SHOW PROFILE FOR QUERY n". No one can get |
| 219 |
the zero item (which is always the statement that turns on profiling), |
| 220 |
because zero represents the final item, internally. |
| 221 |
|
| 222 |
Now, order the queries starting at one. |
| 223 |
|
| 224 |
mysql-test/r/profiling.result@1.4, 2007-04-03 19:52:23-04:00, cmiller@zippy.cornsilk.net +127 -127 |
| 225 |
Renumber the query IDs. |
| 226 |
|
| 227 |
sql/sql_profile.cc@1.8, 2007-04-03 19:52:23-04:00, cmiller@zippy.cornsilk.net +2 -2 |
| 228 |
Start the profile_id_counter at 1, to overstep the special-case |
| 229 |
value of zero. |
| 230 |
|
| 231 |
Unrelated, but looks similar: don't use -1 to initialize an unsigned |
| 232 |
integer field. That causes warnings in some environments. |
| 233 |
|
| 234 |
ChangeSet@1.2392.105.21, 2007-04-03 19:50:55-04:00, cmiller@zippy.cornsilk.net +2 -0 |
| 235 |
Backport: |
| 236 |
|
| 237 |
B-g#27501: 5.0 significantly more sys ("kernel") time than 4.1 \ |
| 238 |
due to getrusage() calls |
| 239 |
|
| 240 |
Even if profiling is turned off, the parser makes calls to reset |
| 241 |
the state at the beginning of each query. That would eventually |
| 242 |
instantiate a PROFILE_ENTRY, which does indeed capture resource |
| 243 |
usage. |
| 244 |
|
| 245 |
Instead, now check that profiling is active before progressing |
| 246 |
far into the storage/expiration of old entries in the history. |
| 247 |
This has the pleasant side-effect that queries to toggle profiling |
| 248 |
are not recorded in the history. |
| 249 |
|
| 250 |
mysql-test/r/profiling.result@1.3, 2007-04-03 19:50:53-04:00, cmiller@zippy.cornsilk.net +1 -1 |
| 251 |
Now after we turn off profiling, the beginning of the next query |
| 252 |
refuses to enter the profiling code and it discards the info. |
| 253 |
|
| 254 |
sql/sql_profile.cc@1.7, 2007-04-03 19:50:53-04:00, cmiller@zippy.cornsilk.net +11 -0 |
| 255 |
Add the same condition twice: Once to abort storing previous |
| 256 |
query information and the other to abort initialization for this |
| 257 |
query that is starting. |
| 258 |
|
| 259 |
We do this symmetrically, before and after expiring old history |
| 260 |
entries, so that the counts are correct. |
| 261 |
|
| 262 |
ChangeSet@1.2392.105.20, 2007-04-03 19:47:19-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 263 |
Backport: |
| 264 |
|
| 265 |
B-g#26600: table PROFILING in INFORMATION SCHEMA has wrong data type |
| 266 |
|
| 267 |
B-g#27047[partial]: INFORMATION_SCHEMA table cannot have BIGINT \ |
| 268 |
fields |
| 269 |
|
| 270 |
No Information_schema table has ever needed floating-point data |
| 271 |
before. Transforming all floating point to a string and back to a |
| 272 |
number causes a real data problem on Windows, where the libc may |
| 273 |
pad the exponent with more leading zeroes than we expect and the |
| 274 |
significant digits are truncated away. |
| 275 |
|
| 276 |
This also makes interpreting an unimplemented type as a string into |
| 277 |
a fatal error in debug builds. Thus, we will catch problems when we |
| 278 |
try to use those types in new I_S tables. |
| 279 |
|
| 280 |
sql/sql_show.cc@1.341.2.2, 2007-04-03 19:47:17-04:00, cmiller@zippy.cornsilk.net +9 -0 |
| 281 |
Add floating-point types to Information_schema output. |
| 282 |
|
| 283 |
ChangeSet@1.2392.105.19, 2007-04-03 19:45:28-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 284 |
Backport: |
| 285 |
|
| 286 |
B-g#27060: SQL Profile utility may not be reporting right duration \ |
| 287 |
for each step |
| 288 |
|
| 289 |
Whenever the profiler is reset at the beginning of a query, there's |
| 290 |
a "hidden" profiling entry that represents that point in time. It |
| 291 |
has no status description, as those are set by state changes and no |
| 292 |
such point has yet been encountered. That profiling entry is not |
| 293 |
in the list of entries generated when we change states. |
| 294 |
|
| 295 |
The profiling code had the problem that each step of printing |
| 296 |
profiling data subtracted the previous "step"'s data, but gave the |
| 297 |
label to that data of the current step, which is wrong. The label/ |
| 298 |
state refers to the period beginning with that profiling data, not |
| 299 |
ending with it. |
| 300 |
|
| 301 |
Now, give a label to the first profiling pseudo-entry, so that we |
| 302 |
have a name to assign to the period that ends with the first state |
| 303 |
change. Now also use the state name of the previous step in showing |
| 304 |
the delta values that end with this step. |
| 305 |
|
| 306 |
sql/sql_profile.cc@1.6, 2007-04-03 19:45:26-04:00, cmiller@zippy.cornsilk.net +61 -46 |
| 307 |
Store a status of "initializing" whenever we construct the first |
| 308 |
profile entry -- the one that gets reset whenever we're starting |
| 309 |
a new query, before the server sets a real status. |
| 310 |
|
| 311 |
Additionally, associate the previous status with the time period |
| 312 |
that ends with the current profile entry's stats. |
| 313 |
|
| 314 |
Since we need yet another piece of info from the previous profiling |
| 315 |
entry, take out the piecemeal ways we currently do it and make a |
| 316 |
general pointer to the whole thing. |
| 317 |
|
| 318 |
ChangeSet@1.2392.105.18, 2007-04-03 18:12:31-04:00, cmiller@zippy.cornsilk.net +3 -0 |
| 319 |
Backport: |
| 320 |
|
| 321 |
Patch contributed by Jocelyn Fournier. CLA received 2007-02-27. |
| 322 |
|
| 323 |
B-g#25347: mysqlcheck -A -r doesn't repair table marked as crashed |
| 324 |
|
| 325 |
mysqlcheck tests nullness of the engine type to know whether the |
| 326 |
"table" is a view or not. That also falsely catches tables that |
| 327 |
are severly damaged. |
| 328 |
|
| 329 |
Instead, use SHOW FULL TABLES to test whether a "table" is a view |
| 330 |
or not. |
| 331 |
|
| 332 |
(Don't add new function. Instead, get original data a smarter way.) |
| 333 |
|
| 334 |
Make it safe for use against databases before when views appeared. |
| 335 |
|
| 336 |
client/mysqlcheck.c@1.59, 2007-04-03 18:12:29-04:00, cmiller@zippy.cornsilk.net +15 -12 |
| 337 |
Use SHOW FULL TABLES to test better whether a name in the table |
| 338 |
list is one of a view. Checking that the engine is NULL is |
| 339 |
insufficient. |
| 340 |
|
| 341 |
Implemented suggestion from jimw that involved removing most of |
| 342 |
original patch and getting data a better way |
| 343 |
|
| 344 |
mysql-test/r/mysqlcheck.result@1.4, 2007-04-03 18:12:29-04:00, cmiller@zippy.cornsilk.net +10 -0 |
| 345 |
Verify that tables that have NULL/unreadable engine types are |
| 346 |
processed and not interpreted as views. |
| 347 |
|
| 348 |
mysql-test/t/mysqlcheck.test@1.4, 2007-04-03 18:12:29-04:00, cmiller@zippy.cornsilk.net +16 -0 |
| 349 |
Verify that tables that have NULL/unreadable engine types are |
| 350 |
processed and not interpreted as views. |
| 351 |
|
| 352 |
ChangeSet@1.2392.105.17, 2007-04-03 17:59:52-04:00, cmiller@zippy.cornsilk.net +2 -0 |
| 353 |
Backport: |
| 354 |
|
| 355 |
B-g#24795: SHOW PROFILE implementation |
| 356 |
|
| 357 |
Don't use memory roots to store profiling information, because |
| 358 |
memory roots make freeing the data a no-op, and thus long-running |
| 359 |
processes with profiling turned on the whole time could eventually |
| 360 |
use all available memory. |
| 361 |
|
| 362 |
Instead, use regular heap allocation and deallocation calls to |
| 363 |
manage profiling data. Replace the leaky List usage with a similar- |
| 364 |
behaving structure named "Queue". |
| 365 |
|
| 366 |
sql/sql_profile.cc@1.5, 2007-04-03 17:59:50-04:00, cmiller@zippy.cornsilk.net +39 -72 |
| 367 |
Don't use C++ iterators on our simple Queue implementation. They're |
| 368 |
not implemented and we don't really need them. |
| 369 |
|
| 370 |
Rip out idea of swapping out the thd's mem_root. |
| 371 |
|
| 372 |
sql/sql_profile.h@1.4, 2007-04-03 17:59:50-04:00, cmiller@zippy.cornsilk.net +108 -3 |
| 373 |
Rip out idea of needing a mem_root. |
| 374 |
|
| 375 |
Implement a Queue that looks and behaves very similarly to memroot- |
| 376 |
using List. |
| 377 |
|
| 378 |
ChangeSet@1.2392.105.16, 2007-04-03 14:08:09-04:00, cmiller@zippy.cornsilk.net +3 -0 |
| 379 |
Backport of Igor's patch for Bug#27362, March 22 2007. |
| 380 |
|
| 381 |
Fixed bug #27362: crash at evaluation of IN predicate when one |
| 382 |
of its argument happened to be a decimal expression returning |
| 383 |
the NULL value. |
| 384 |
The crash was due to the fact the function in_decimal::set did |
| 385 |
not take into account that val_decimal() could return 0 if |
| 386 |
the decimal expression had been evaluated to NULL. |
| 387 |
|
| 388 |
mysql-test/r/func_in.result@1.33.1.1, 2007-04-03 14:08:07-04:00, cmiller@zippy.cornsilk.net +5 -0 |
| 389 |
Added a test case for bug #27362. |
| 390 |
|
| 391 |
mysql-test/t/func_in.test@1.27.1.1, 2007-04-03 14:08:07-04:00, cmiller@zippy.cornsilk.net +11 -0 |
| 392 |
Added a test case for bug #27362. |
| 393 |
|
| 394 |
sql/item_cmpfunc.cc@1.240.1.2, 2007-04-03 14:08:07-04:00, cmiller@zippy.cornsilk.net +2 -1 |
| 395 |
Fixed bug #27362: crash at evaluation of IN predicate when one |
| 396 |
of its argument happened to be a decimal expression returning |
| 397 |
the NULL value. |
| 398 |
The crash was due to the fact the function in_decimal::set did |
| 399 |
not take into account that val_decimal() could return 0 if |
| 400 |
the decimal expression had been evaluated to NULL. |
| 401 |
|
| 402 |
ChangeSet@1.2392.105.15, 2007-04-03 14:05:00-04:00, cmiller@zippy.cornsilk.net +2 -0 |
| 403 |
The test suite erroneously removes backslashes. |
| 404 |
|
| 405 |
mysql-test/r/profiling.result@1.2, 2007-04-03 14:04:58-04:00, cmiller@zippy.cornsilk.net +1 -1 |
| 406 |
The test suite erroneously removes backslashes. |
| 407 |
|
| 408 |
mysql-test/t/profiling.test@1.2, 2007-04-03 14:04:58-04:00, cmiller@zippy.cornsilk.net +1 -1 |
| 409 |
The test suite erroneously removes backslashes. |
| 410 |
|
| 411 |
ChangeSet@1.2392.105.14, 2007-04-03 13:26:19-04:00, cmiller@zippy.cornsilk.net +1 -0 |
| 412 |
Listing all columns of a particular type tells us nothing at all. |
| 413 |
The test fails, and it shouldn't. |
| 414 |
|
| 415 |
mysql-test/r/information_schema.result@1.123, 2007-04-03 13:26:17-04:00, cmiller@zippy.cornsilk.net +1 -1 |
| 416 |
The query to generate this list is pretty bogus in any case. Listing |
| 417 |
all columns of a particular type tells us nothing at all. |
| 418 |
|
| 419 |
ChangeSet@1.2392.72.1, 2007-03-07 20:25:57+01:00, df@pippilotta.erinye.com +1 -0 |
| 420 |
adjust version string in mysql-5.0-community commit trigger |
| 421 |
|
| 422 |
BitKeeper/triggers/post-commit@1.42, 2007-03-07 20:25:55+01:00, df@pippilotta.erinye.com +1 -1 |
| 423 |
adjust version string in trigger |
| 424 |
|
| 425 |
ChangeSet@1.2392.40.7, 2007-03-05 16:10:42+01:00, df@pippilotta.erinye.com +1 -0 |
| 426 |
add ad |
| 427 |
TAG: mysql-5.0.37 |
| 428 |
|
| 429 |
support-files/mysql.spec.sh@1.165.1.1, 2007-03-05 16:10:41+01:00, df@pippilotta.erinye.com +5 -0 |
| 430 |
add ad at %post |
| 431 |
|
| 432 |
ChangeSet@1.2392.60.1, 2007-03-02 09:14:33-05:00, cmiller@zippy.cornsilk.net +2 -0 |
| 433 |
Patch to release clone. Fixes two post-pushbuild discovered failures. |
| 434 |
|
| 435 |
Expand float size to avoid assert()ion failures. |
| 436 |
|
| 437 |
"_db_func_" isn't a known linked object on some platforms, possibly |
| 438 |
because it is occasionaly shadowed by DBUG variables. Avoid that |
| 439 |
confusion. |
| 440 |
|
| 441 |
sql/sql_profile.cc@1.4, 2007-03-02 09:14:31-05:00, cmiller@zippy.cornsilk.net +2 -2 |
| 442 |
Expand float size to avoid assert()ion failures. |
| 443 |
|
| 444 |
"_db_func_" isn't a known linked object on some platforms, possibly |
| 445 |
because it is occasionaly shadowed by DBUG variables. Avoid that |
| 446 |
confusion. |
| 447 |
|
| 448 |
sql/sql_profile.h@1.3, 2007-03-02 09:14:31-05:00, cmiller@zippy.cornsilk.net +6 -6 |
| 449 |
"_db_func_" isn't a known linked object on some platforms, possibly |
| 450 |
because it is occasionaly shadowed by DBUG variables. Avoid that |
| 451 |
confusion. |
| 452 |
|
| 453 |
ChangeSet@1.2392.40.5, 2007-03-01 21:56:51+01:00, df@pippilotta.erinye.com +1 -0 |
| 454 |
add missing file to vs project |
| 455 |
|
| 456 |
VC++Files/sql/mysqld.vcproj@1.11, 2007-03-01 21:56:50+01:00, df@pippilotta.erinye.com +75 -0 |
| 457 |
add sql_profile.cpp to mysqld project |
| 458 |
|
| 459 |
ChangeSet@1.2392.40.4, 2007-03-01 10:45:55+01:00, dfischer@mysql.com +1 -0 |
| 460 |
File.cpp: |
| 461 |
fileno is a macro on some platforms |
| 462 |
|
| 463 |
ndb/src/common/util/File.cpp@1.13.1.4, 2007-03-01 10:45:41+01:00, dfischer@mysql.com +1 -1 |
| 464 |
fileno is a macro on some platforms |
| 465 |
|
| 466 |
ChangeSet@1.2392.40.3, 2007-03-01 09:38:09+01:00, dfischer@mysql.com +1 -0 |
| 467 |
mysqld.cc: |
| 468 |
fix profiling_history_size type |
| 469 |
|
| 470 |
sql/mysqld.cc@1.582.20.2, 2007-03-01 09:37:10+01:00, dfischer@mysql.com +1 -1 |
| 471 |
fix profiling_history_size type |
| 472 |
|
| 473 |
ChangeSet@1.2392.40.2, 2007-02-27 20:04:58-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 474 |
Update to I_S result that now contains PROFILING entry. |
| 475 |
TAG: clone-5.0.37-build |
| 476 |
|
| 477 |
mysql-test/r/information_schema.result@1.122, 2007-02-27 20:04:57-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 478 |
Update to I_S result that now contains PROFILING entry. |
| 479 |
|
| 480 |
ChangeSet@1.2341.59.11, 2007-02-27 11:30:03-05:00, cmiller@calliope.local.cmiller +1 -0 |
| 481 |
Updated column names of I_S table to conform to other I_S uppercase scheme. |
| 482 |
|
| 483 |
mysql-test/r/information_schema.result@1.120, 2007-02-27 11:28:40-05:00, cmiller@calliope.local.cmiller +2 -2 |
| 484 |
Updated column names of I_S table to conform to other I_S uppercase scheme. |
| 485 |
|
| 486 |
ChangeSet@1.2341.59.10, 2007-02-26 13:11:36-05:00, cmiller@calliope.local.cmiller +7 -0 |
| 487 |
Some changes suggested Serg, from message <20070223210659.GA24202@janus.mylan> |
| 488 |
|
| 489 |
configure.in@1.422, 2007-02-26 13:11:22-05:00, cmiller@calliope.local.cmiller +1 -1 |
| 490 |
Use smarter autoconf help macro. |
| 491 |
|
| 492 |
sql/set_var.cc@1.173.2.4, 2007-02-26 13:11:23-05:00, cmiller@calliope.local.cmiller +1 -1 |
| 493 |
Make a local variable static. |
| 494 |
|
| 495 |
sql/sql_lex.cc@1.206.1.6, 2007-02-26 13:11:23-05:00, cmiller@calliope.local.cmiller +0 -2 |
| 496 |
Don't include CPP condition where it saves little time and decreases legibility. |
| 497 |
|
| 498 |
sql/sql_parse.cc@1.596, 2007-02-26 13:11:24-05:00, cmiller@calliope.local.cmiller +2 -2 |
| 499 |
Use the name of the query in the error, instead of describing the feature. |
| 500 |
|
| 501 |
sql/sql_profile.cc@1.3, 2007-02-26 13:11:25-05:00, cmiller@calliope.local.cmiller +38 -52 |
| 502 |
Update copyright. |
| 503 |
|
| 504 |
Make I_S schema table columns uppercase. |
| 505 |
|
| 506 |
sql/sql_profile.h@1.2, 2007-02-26 13:11:26-05:00, cmiller@calliope.local.cmiller +1 -2 |
| 507 |
Update copyright. |
| 508 |
|
| 509 |
sql/sql_select.cc@1.478.2.3, 2007-02-26 13:11:26-05:00, cmiller@calliope.local.cmiller +2 -2 |
| 510 |
Chagne tab indentation to spaces. |
| 511 |
|
| 512 |
ChangeSet@1.2341.59.9, 2007-02-22 16:25:47-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 513 |
Disambiguate method call. (Windows compiler error.) |
| 514 |
|
| 515 |
sql/sql_profile.cc@1.2, 2007-02-22 16:25:45-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 516 |
Disambiguate method call. (Windows compiler error.) |
| 517 |
|
| 518 |
ChangeSet@1.2341.59.8, 2007-02-22 13:17:02-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 519 |
Use correct filename for profiling code. |
| 520 |
|
| 521 |
sql/CMakeLists.txt@1.6, 2007-02-22 13:17:01-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 522 |
Use correct filename for profiling code. |
| 523 |
|
| 524 |
ChangeSet@1.2341.59.7, 2007-02-22 12:27:15-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 525 |
Add profiling source file to cmake file. |
| 526 |
|
| 527 |
sql/CMakeLists.txt@1.5, 2007-02-22 12:27:14-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 528 |
Add profiling source file to cmake file. |
| 529 |
|
| 530 |
ChangeSet@1.2341.59.6, 2007-02-22 11:48:56-05:00, cmiller@zippy.cornsilk.net +3 -0 |
| 531 |
Enclose profiling in preprocessor conditions. |
| 532 |
|
| 533 |
BitKeeper/etc/collapsed@1.18.1.4, 2007-02-22 11:44:51-05:00, cmiller@zippy.cornsilk.net +2 -0 |
| 534 |
|
| 535 |
include/config-win.h@1.81.1.2, 2007-02-22 11:48:55-05:00, cmiller@zippy.cornsilk.net +3 -0 |
| 536 |
Make profiling compiled-in by default on Windows too. |
| 537 |
|
| 538 |
sql/sql_prepare.cc@1.187.5.2, 2007-02-22 11:48:55-05:00, cmiller@zippy.cornsilk.net +2 -0 |
| 539 |
Enclose profiling in preprocessor conditions. |
| 540 |
|
| 541 |
ChangeSet@1.2341.59.5, 2007-02-22 10:03:08-05:00, cmiller@zippy.cornsilk.net +51 -0 |
| 542 |
Prevent bugs by making DBUG_* expressions syntactically equivalent |
| 543 |
to a single statement. |
| 544 |
--- |
| 545 |
Bug#24795: SHOW PROFILE |
| 546 |
|
| 547 |
Profiling is only partially functional on some architectures. Where |
| 548 |
there is no getrusage() system call, presently Null values are |
| 549 |
returned where it would be required. Notably, Windows needs some love |
| 550 |
applied to make it as useful. |
| 551 |
|
| 552 |
Syntax this adds: |
| 553 |
|
| 554 |
SHOW PROFILES |
| 555 |
|
| 556 |
SHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n] |
| 557 |
where "n" is an integer |
| 558 |
and "types" is zero or many (comma-separated) of |
| 559 |
"CPU" |
| 560 |
"MEMORY" (not presently supported) |
| 561 |
"BLOCK IO" |
| 562 |
"CONTEXT SWITCHES" |
| 563 |
"PAGE FAULTS" |
| 564 |
"IPC" |
| 565 |
"SWAPS" |
| 566 |
"SOURCE" |
| 567 |
"ALL" |
| 568 |
|
| 569 |
It also adds a session variable (boolean) "profiling", set to "no" |
| 570 |
by default, and (integer) profiling_history_size, set to 15 by |
| 571 |
default. |
| 572 |
|
| 573 |
This patch abstracts setting THDs' "proc_info" behind a macro that |
| 574 |
can be used as a hook into the profiling code when profiling |
| 575 |
support is compiled in. All future code in this line should use |
| 576 |
that mechanism for setting thd->proc_info. |
| 577 |
|
| 578 |
--- |
| 579 |
|
| 580 |
Tests are now set to omit the statistics. |
| 581 |
|
| 582 |
--- |
| 583 |
|
| 584 |
Adds an Information_schema table, "profiling" for access to |
| 585 |
"show profile" data. |
| 586 |
--- |
| 587 |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-3--bug24795 |
| 588 |
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community |
| 589 |
--- |
| 590 |
Fix merge problems. |
| 591 |
--- |
| 592 |
Fixed one bug in the query_source being NULL. |
| 593 |
|
| 594 |
Updated test results. |
| 595 |
--- |
| 596 |
Include more thorough profiling tests. |
| 597 |
|
| 598 |
Improve support for prepared statements. |
| 599 |
|
| 600 |
Use session-specific query IDs, starting at zero. |
| 601 |
--- |
| 602 |
Selecting from I_S.profiling is no longer quashed in profiling, as |
| 603 |
requested by Giuseppe. |
| 604 |
|
| 605 |
Limit the size of captured query text. |
| 606 |
|
| 607 |
No longer log queries that are zero length. |
| 608 |
|
| 609 |
BitKeeper/deleted/.del-profile.result@1.2, 2007-02-22 10:02:24-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 610 |
Rename: mysql-test/r/profile.result -> BitKeeper/deleted/.del-profile.result |
| 611 |
|
| 612 |
BitKeeper/deleted/.del-profile.test@1.2, 2007-02-22 10:02:24-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 613 |
Rename: mysql-test/t/profile.test -> BitKeeper/deleted/.del-profile.test |
| 614 |
|
| 615 |
BitKeeper/deleted/.del-profiling-master.opt@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 616 |
New BitKeeper file ``mysql-test/t/profiling-master.opt'' |
| 617 |
|
| 618 |
BitKeeper/deleted/.del-profiling-master.opt@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 619 |
|
| 620 |
BitKeeper/deleted/.del-sql_profile.cc@1.2, 2007-02-22 10:02:25-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 621 |
Rename: sql/sql_profile.cc -> BitKeeper/deleted/.del-sql_profile.cc |
| 622 |
|
| 623 |
BitKeeper/deleted/.del-sql_profile.h@1.2, 2007-02-22 10:02:26-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 624 |
Rename: sql/sql_profile.h -> BitKeeper/deleted/.del-sql_profile.h |
| 625 |
|
| 626 |
BitKeeper/etc/collapsed@1.18.1.3, 2007-02-22 10:02:26-05:00, cmiller@zippy.cornsilk.net +9 -0 |
| 627 |
|
| 628 |
configure.in@1.421, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +14 -0 |
| 629 |
Add a configure-time option to enable/disable query profiling. The |
| 630 |
default is enabled. |
| 631 |
|
| 632 |
include/my_dbug.h@1.22, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +6 -6 |
| 633 |
|
| 634 |
|
| 635 |
DBUG_* statements should be syntactically equivalent to a single |
| 636 |
statement. |
| 637 |
|
| 638 |
myisam/mi_open.c@1.100.2.2, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 639 |
DBUG_* statements should be syntactically equivalent to a single |
| 640 |
statement. |
| 641 |
|
| 642 |
mysql-test/r/information_schema.result@1.119, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +7 -4 |
| 643 |
Updated (re-recorded) tests that I missed somehow. I verified these |
| 644 |
for correctness. |
| 645 |
|
| 646 |
mysql-test/r/information_schema_db.result@1.10, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 647 |
Updated test results I missed. |
| 648 |
|
| 649 |
mysql-test/r/mysqlshow.result@1.5, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +2 -0 |
| 650 |
Fix merge problems. |
| 651 |
|
| 652 |
mysql-test/r/profiling.result@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +365 -0 |
| 653 |
New BitKeeper file ``mysql-test/r/profiling.result'' |
| 654 |
--- |
| 655 |
Include more verbose that describes the queries so far. |
| 656 |
|
| 657 |
Include Giuseppe's tests. |
| 658 |
--- |
| 659 |
Selecting from I_S.profiling is no longer quashed in profiling, as |
| 660 |
requested by Giuseppe. |
| 661 |
|
| 662 |
mysql-test/r/profiling.result@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 663 |
|
| 664 |
mysql-test/t/profiling.test@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +195 -0 |
| 665 |
New BitKeeper file ``mysql-test/t/profiling.test'' |
| 666 |
--- |
| 667 |
Include more verbose that describes the queries so far. |
| 668 |
|
| 669 |
Include Giuseppe's tests. |
| 670 |
--- |
| 671 |
Selecting from I_S.profiling is no longer quashed in profiling, as |
| 672 |
requested by Giuseppe. |
| 673 |
|
| 674 |
mysql-test/t/profiling.test@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 675 |
|
| 676 |
ndb/src/ndbapi/DictCache.cpp@1.21, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 677 |
DBUG_* statements should be syntactically equivalent to a single |
| 678 |
statement. |
| 679 |
|
| 680 |
sql/ha_archive.cc@1.78.1.3, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +2 -2 |
| 681 |
Abstract setting thread-info into a function or macro. |
| 682 |
--- |
| 683 |
Manual merge, undoing first patch. |
| 684 |
|
| 685 |
sql/ha_berkeley.cc@1.165.1.1, 2007-02-22 10:03:02-05:00, cmiller@zippy.cornsilk.net +2 -2 |
| 686 |
Include patch backported to 5.0-global. |
| 687 |
|
| 688 |
THD::options is a ulonglong, not ulong. |
| 689 |
|
| 690 |
sql/ha_myisam.cc@1.170.1.4, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +12 -12 |
| 691 |
Abstract setting thread-info into a function or macro. |
| 692 |
--- |
| 693 |
Manual merge, undoing first patch. |
| 694 |
|
| 695 |
sql/ha_myisammrg.cc@1.85.2.1, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 696 |
DBUG_* statements should be syntactically equivalent to a single |
| 697 |
statement. |
| 698 |
|
| 699 |
sql/ha_ndbcluster.cc@1.291.7.1, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +2 -2 |
| 700 |
DBUG_* statements should be syntactically equivalent to a single |
| 701 |
statement. |
| 702 |
|
| 703 |
sql/item_cmpfunc.cc@1.228.6.1, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 704 |
DBUG_* statements should be syntactically equivalent to a single |
| 705 |
statement. |
| 706 |
|
| 707 |
sql/item_func.cc@1.317.1.7, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +4 -4 |
| 708 |
Abstract setting thread-info into a function or macro. |
| 709 |
--- |
| 710 |
Manual merge, undoing first patch. |
| 711 |
|
| 712 |
sql/lock.cc@1.90.1.4, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +4 -4 |
| 713 |
Abstract setting thread-info into a function or macro. |
| 714 |
--- |
| 715 |
Manual merge, undoing first patch. |
| 716 |
|
| 717 |
sql/log_event.cc@1.214.3.3, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +4 -4 |
| 718 |
Abstract setting thread-info into a function or macro. |
| 719 |
--- |
| 720 |
Manual merge, undoing first patch. |
| 721 |
|
| 722 |
sql/mysql_priv.h@1.425.2.5, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +40 -33 |
| 723 |
Use 64-bit constants for the 64-bit bit field. |
| 724 |
|
| 725 |
Add a new option bit for whether profiling is active or not. |
| 726 |
|
| 727 |
sql/mysqld.cc@1.582.9.2, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +8 -1 |
| 728 |
Add semicolon to DBUG statement. |
| 729 |
|
| 730 |
Add a new system variable and set it. |
| 731 |
--- |
| 732 |
Set the minimum, which is zero and not 50. |
| 733 |
|
| 734 |
sql/repl_failsafe.cc@1.61.1.4, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +5 -5 |
| 735 |
Abstract setting thread-info into a function or macro. |
| 736 |
--- |
| 737 |
Manual merge, undoing first patch. |
| 738 |
|
| 739 |
sql/set_var.cc@1.173.2.3, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +16 -2 |
| 740 |
Make a new system global variable and session variable, to determine |
| 741 |
behavior of profiling. |
| 742 |
--- |
| 743 |
Include patch backported to 5.0-global. |
| 744 |
|
| 745 |
THD::options is a ulonglong, not ulong. |
| 746 |
|
| 747 |
sql/set_var.h@1.78.3.1, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +2 -2 |
| 748 |
The THD::options bit field is ulonglong, not ulong. |
| 749 |
|
| 750 |
sql/slave.cc@1.286.1.3, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +20 -20 |
| 751 |
Abstract setting thread-info into a function or macro. |
| 752 |
--- |
| 753 |
Manual merge, undoing first patch. |
| 754 |
--- |
| 755 |
Include patch backported to 5.0-global. |
| 756 |
|
| 757 |
THD::options is a ulonglong, not ulong. |
| 758 |
|
| 759 |
sql/sp_head.cc@1.225.3.4, 2007-02-22 10:03:03-05:00, cmiller@zippy.cornsilk.net +2 -2 |
| 760 |
Abstract setting thread-info into a function or macro. |
| 761 |
--- |
| 762 |
Manual merge, undoing first patch. |
| 763 |
|
| 764 |
sql/sql_base.cc@1.363, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +15 -15 |
| 765 |
Abstract setting thread-info into a function or macro. |
| 766 |
--- |
| 767 |
Manual merge, undoing first patch. |
| 768 |
--- |
| 769 |
Include patch backported to 5.0-global. |
| 770 |
|
| 771 |
THD::options is a ulonglong, not ulong. |
| 772 |
|
| 773 |
sql/sql_cache.cc@1.99, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +11 -11 |
| 774 |
DBUG_* statements should be syntactically equivalent to a single |
| 775 |
statement. |
| 776 |
--- |
| 777 |
Fix merge problems. |
| 778 |
|
| 779 |
sql/sql_class.cc@1.258, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +2 -1 |
| 780 |
Insert a pointer to the current thread in the profiling code. |
| 781 |
--- |
| 782 |
Manual merge, undoing first patch. |
| 783 |
--- |
| 784 |
Fix merge problems. |
| 785 |
|
| 786 |
sql/sql_class.h@1.316, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +6 -1 |
| 787 |
Create a new system variable, profiling_history_size, and add a |
| 788 |
member to THD to hold profiling information about this thread's |
| 789 |
execution. |
| 790 |
--- |
| 791 |
Manual merge, undoing first patch. |
| 792 |
|
| 793 |
sql/sql_delete.cc@1.190, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +7 -7 |
| 794 |
Abstract setting thread-info into a function or macro. |
| 795 |
--- |
| 796 |
Manual merge, undoing first patch. |
| 797 |
--- |
| 798 |
Include patch backported to 5.0-global. |
| 799 |
|
| 800 |
THD::options is a ulonglong, not ulong. |
| 801 |
|
| 802 |
sql/sql_insert.cc@1.213, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +19 -19 |
| 803 |
Abstract setting thread-info into a function or macro. |
| 804 |
--- |
| 805 |
Manual merge, undoing first patch. |
| 806 |
--- |
| 807 |
Fix merge problems. |
| 808 |
|
| 809 |
sql/sql_lex.cc@1.206.1.5, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +2 -1 |
| 810 |
Initialize profiling options to empty. |
| 811 |
--- |
| 812 |
Manual merge, undoing first patch. |
| 813 |
|
| 814 |
sql/sql_lex.h@1.233.1.5, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +7 -2 |
| 815 |
Add info to the lexer object so that we can hold data that comes from |
| 816 |
parsing statements. |
| 817 |
|
| 818 |
Reuse memory addresses of uints that can't occur in the same state- |
| 819 |
ment. |
| 820 |
|
| 821 |
This is dangerous because it involves knowledge of what symbols are |
| 822 |
never used together, which is information stored obliquely in another |
| 823 |
file. |
| 824 |
--- |
| 825 |
Manual merge, undoing first patch. |
| 826 |
|
| 827 |
sql/sql_parse.cc@1.595, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +47 -24 |
| 828 |
Add hooks to the parser to jump to profiling code. |
| 829 |
|
| 830 |
If profiling is not present, then return an error message upon being |
| 831 |
used. |
| 832 |
--- |
| 833 |
Manual merge, undoing first patch. |
| 834 |
--- |
| 835 |
Fix merge problems. |
| 836 |
--- |
| 837 |
Include patch backported to 5.0-global. |
| 838 |
|
| 839 |
THD::options is a ulonglong, not ulong. |
| 840 |
|
| 841 |
sql/sql_prepare.cc@1.187.5.1, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 842 |
From prepared statement execution, set the query source in the |
| 843 |
profiler, as we can't get it from thd . |
| 844 |
--- |
| 845 |
Make it less expensive to limit the size of the queries. |
| 846 |
|
| 847 |
sql/sql_profile.cc@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +813 -0 |
| 848 |
New BitKeeper file ``sql/sql_profile.cc'' |
| 849 |
--- |
| 850 |
If query_source is NULL, as can sometimes happen, then don't try |
| 851 |
to copy that memory. |
| 852 |
--- |
| 853 |
Make each new session use its own numbering of query_ids, and not |
| 854 |
show the global-pool numbers to the user. |
| 855 |
|
| 856 |
Provide a way for prepared statements to set the query_source. |
| 857 |
--- |
| 858 |
Selecting from I_S.profiling is no longer quashed in profiling, as |
| 859 |
requested by Giuseppe. |
| 860 |
|
| 861 |
Limit the size of captured query text. |
| 862 |
|
| 863 |
No longer log queries that are zero length. |
| 864 |
|
| 865 |
sql/sql_profile.cc@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 866 |
|
| 867 |
sql/sql_profile.h@1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +241 -0 |
| 868 |
New BitKeeper file ``sql/sql_profile.h'' |
| 869 |
--- |
| 870 |
Make each new session use its own numbering of query_ids, and not |
| 871 |
show the global-pool numbers to the user. |
| 872 |
|
| 873 |
Provide a way for prepared statements to set the query_source. |
| 874 |
--- |
| 875 |
Make it less expensive to limit the size of the queries. |
| 876 |
|
| 877 |
sql/sql_profile.h@1.0, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 878 |
|
| 879 |
sql/sql_repl.cc@1.157, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +9 -9 |
| 880 |
Abstract setting thread-info into a function or macro. |
| 881 |
--- |
| 882 |
Manual merge, undoing first patch. |
| 883 |
|
| 884 |
sql/sql_select.cc@1.478.2.2, 2007-02-22 10:03:04-05:00, cmiller@zippy.cornsilk.net +23 -24 |
| 885 |
Abstract setting thread-info into a function or macro. |
| 886 |
--- |
| 887 |
Manual merge, undoing first patch. |
| 888 |
--- |
| 889 |
Fix merge problems. |
| 890 |
|
| 891 |
sql/sql_show.cc@1.333.2.4, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +5 -3 |
| 892 |
Abstract setting thread-info into a function or macro. |
| 893 |
|
| 894 |
Also, remove "static" qualification on schema_table_store_record() |
| 895 |
so that external functions may use it. |
| 896 |
--- |
| 897 |
Manual merge, undoing first patch. |
| 898 |
|
| 899 |
sql/sql_table.cc@1.328.1.3, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +10 -10 |
| 900 |
Abstract setting thread-info into a function or macro. |
| 901 |
--- |
| 902 |
Manual merge, undoing first patch. |
| 903 |
|
| 904 |
sql/sql_update.cc@1.205.2.4, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +7 -7 |
| 905 |
Abstract setting thread-info into a function or macro. |
| 906 |
--- |
| 907 |
Manual merge, undoing first patch. |
| 908 |
|
| 909 |
sql/sql_view.cc@1.100.1.3, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 910 |
Abstract setting thread-info into a function or macro. |
| 911 |
--- |
| 912 |
Manual merge, undoing first patch. |
| 913 |
|
| 914 |
sql/sql_yacc.yy@1.498.1.4, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +48 -32 |
| 915 |
Add new lexer symbols and insert new grammatical rules necessary to |
| 916 |
retreive profiling information. |
| 917 |
--- |
| 918 |
Manual merge, undoing first patch. |
| 919 |
--- |
| 920 |
Fix merge problems. |
| 921 |
|
| 922 |
sql/table.h@1.137.1.1, 2007-02-22 10:03:05-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 923 |
Add enum item for query profiling. |
| 924 |
|
| 925 |
ChangeSet@1.2341.74.1, 2007-01-18 09:50:16-05:00, cmiller@zippy.cornsilk.net +7 -0 |
| 926 |
Bug#24822: Patch: uptime_since_flush_status |
| 927 |
|
| 928 |
Provide the number of seconds since flush as a new status variable |
| 929 |
named "Uptime_since_flush_status". |
| 930 |
--- |
| 931 |
Override the post-flush value, as a second could pass between the two |
| 932 |
statements. |
| 933 |
|
| 934 |
BitKeeper/etc/collapsed@1.18.1.2, 2007-01-18 09:49:43-05:00, cmiller@zippy.cornsilk.net +2 -0 |
| 935 |
|
| 936 |
mysql-test/r/information_schema.result@1.118, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +7 -0 |
| 937 |
Test new status variable. |
| 938 |
--- |
| 939 |
Override the post-flush value, as a second could pass between the two |
| 940 |
statements. |
| 941 |
|
| 942 |
mysql-test/t/information_schema.test@1.89, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +10 -3 |
| 943 |
Test new status variable. |
| 944 |
--- |
| 945 |
Override the post-flush value, as a second could pass between the two |
| 946 |
statements. |
| 947 |
|
| 948 |
sql/mysql_priv.h@1.425.6.1, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 949 |
Add variable to hold previous flush time. |
| 950 |
|
| 951 |
sql/mysqld.cc@1.582.8.1, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +4 -2 |
| 952 |
Add variable to hold previous flush time. Insert name for |
| 953 |
referring to it, and initialize the value. |
| 954 |
|
| 955 |
sql/sql_show.cc@1.333.2.3, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +4 -0 |
| 956 |
Yield value of elapsed time since flush when asked. |
| 957 |
|
| 958 |
sql/structs.h@1.58, 2007-01-18 09:50:14-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 959 |
Add new show-flush-time to SHOW types enumeration. |
| 960 |
|
| 961 |
ChangeSet@1.2341.39.7, 2007-01-09 14:42:56+01:00, df@kahlann.erinye.com +1 -0 |
| 962 |
raise version number after cloning 5.0.33 |
| 963 |
|
| 964 |
configure.in@1.419, 2007-01-09 14:42:54+01:00, df@kahlann.erinye.com +2 -2 |
| 965 |
raise version number after cloning 5.0.33 |
| 966 |
|
| 967 |
ChangeSet@1.2341.17.11, 2007-01-09 13:02:15+01:00, dfischer@mysql.com +1 -0 |
| 968 |
configure.in: |
| 969 |
raise version to 5.0.33 |
| 970 |
TAG: mysql-5.0.33 |
| 971 |
|
| 972 |
configure.in@1.407.3.1, 2007-01-09 12:59:56+01:00, dfischer@mysql.com +2 -2 |
| 973 |
raise version to 5.0.33 |
| 974 |
|
| 975 |
ChangeSet@1.2341.34.3, 2007-01-08 15:57:03-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 976 |
Community version numbering. |
| 977 |
|
| 978 |
configure.in@1.413.1.1, 2007-01-08 15:57:01-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 979 |
Community version numbering. |
| 980 |
|
| 981 |
ChangeSet@1.2294.58.1, 2007-01-03 17:15:10-05:00, cmiller@zippy.cornsilk.net +33 -0 |
| 982 |
Bug#24795: Add SHOW PROFILE |
| 983 |
|
| 984 |
Patch contributed by Jeremy Cole. CLA received Oct 2006 by Kaj Arn� |
| 985 |
|
| 986 |
Add rudimentary query profiling support. |
| 987 |
|
| 988 |
mysql-test/r/profile.result@1.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +30 -0 |
| 989 |
Test profiling code. |
| 990 |
--- |
| 991 |
A not-very-useful result. |
| 992 |
|
| 993 |
mysql-test/r/profile.result@1.0, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 994 |
|
| 995 |
mysql-test/t/profile.test@1.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +39 -0 |
| 996 |
Test profiling code. |
| 997 |
--- |
| 998 |
Test syntax, but not values of profiles code. |
| 999 |
|
| 1000 |
mysql-test/t/profile.test@1.0, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 1001 |
|
| 1002 |
sql/sql_profile.cc@1.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +441 -0 |
| 1003 |
Add profiling code. |
| 1004 |
--- |
| 1005 |
Add wishlist comment. |
| 1006 |
|
| 1007 |
sql/sql_profile.cc@1.0, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 1008 |
|
| 1009 |
sql/sql_profile.h@1.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +187 -0 |
| 1010 |
Add profiling code. |
| 1011 |
--- |
| 1012 |
Changed the value of the macro so that it's syntactically equivalent to a |
| 1013 |
single statement. |
| 1014 |
|
| 1015 |
sql/sql_profile.h@1.0, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +0 -0 |
| 1016 |
|
| 1017 |
BitKeeper/etc/collapsed@1.13.1.2, 2007-01-03 17:13:00-05:00, cmiller@zippy.cornsilk.net +3 -0 |
| 1018 |
|
| 1019 |
libmysqld/Makefile.am@1.70.1.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 1020 |
Add profile file to source list. |
| 1021 |
|
| 1022 |
sql/Makefile.am@1.128.1.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +2 -0 |
| 1023 |
Add profiling files to source and header lists. |
| 1024 |
|
| 1025 |
sql/ha_archive.cc@1.78.2.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +2 -2 |
| 1026 |
Macro-ized other discovered instances of setting proc_info. |
| 1027 |
|
| 1028 |
sql/ha_myisam.cc@1.170.2.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +12 -12 |
| 1029 |
Macroize setting thread-state info |
| 1030 |
|
| 1031 |
sql/item_func.cc@1.316.2.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +4 -4 |
| 1032 |
Macro-ized other discovered instances of setting proc_info. |
| 1033 |
|
| 1034 |
sql/lex.h@1.144.1.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +13 -0 |
| 1035 |
Add lexer info for profiling. |
| 1036 |
|
| 1037 |
sql/lock.cc@1.90.2.1, 2007-01-03 17:15:06-05:00, cmiller@zippy.cornsilk.net +4 -4 |
| 1038 |
Macroize setting thread-state info |
| 1039 |
|
| 1040 |
sql/log_event.cc@1.214.4.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +4 -4 |
| 1041 |
Macro-ized other discovered instances of setting proc_info. |
| 1042 |
|
| 1043 |
sql/mysql_priv.h@1.423.4.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +4 -0 |
| 1044 |
Set constants for profiling. |
| 1045 |
|
| 1046 |
sql/repl_failsafe.cc@1.61.2.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +3 -3 |
| 1047 |
Macro-ized other discovered instances of setting proc_info. |
| 1048 |
|
| 1049 |
sql/slave.cc@1.286.2.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +3 -3 |
| 1050 |
Macro-ized other discovered instances of setting proc_info. |
| 1051 |
|
| 1052 |
sql/sp_head.cc@1.225.4.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +2 -2 |
| 1053 |
Macro-ized other discovered instances of setting proc_info. |
| 1054 |
|
| 1055 |
sql/sql_base.cc@1.356.1.3, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +12 -12 |
| 1056 |
Macroize setting thread-state info |
| 1057 |
--- |
| 1058 |
Macro-ized other discovered instances of setting proc_info. |
| 1059 |
|
| 1060 |
sql/sql_cache.cc@1.96.1.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +12 -0 |
| 1061 |
Macroize setting thread-state info |
| 1062 |
|
| 1063 |
sql/sql_class.cc@1.254.5.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +2 -0 |
| 1064 |
Integrate profiling. |
| 1065 |
|
| 1066 |
sql/sql_class.h@1.310.9.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +3 -0 |
| 1067 |
Instantiate profiling object. |
| 1068 |
|
| 1069 |
sql/sql_delete.cc@1.187.1.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +6 -6 |
| 1070 |
Macroize setting thread-state info |
| 1071 |
|
| 1072 |
sql/sql_insert.cc@1.206.4.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +19 -19 |
| 1073 |
Macroize setting thread-state info |
| 1074 |
--- |
| 1075 |
Macro-ized other discovered instances of setting proc_info. |
| 1076 |
|
| 1077 |
sql/sql_lex.cc@1.206.6.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +1 -0 |
| 1078 |
Initialize profiling. |
| 1079 |
|
| 1080 |
sql/sql_lex.h@1.233.2.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +3 -0 |
| 1081 |
Define lex tokens and allocate space for profiling options. |
| 1082 |
|
| 1083 |
sql/sql_parse.cc@1.590.10.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +28 -12 |
| 1084 |
Integrate profiling. |
| 1085 |
--- |
| 1086 |
Macro-ized other discovered instances of setting proc_info. |
| 1087 |
|
| 1088 |
sql/sql_repl.cc@1.153.1.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 1089 |
Macro-ized other discovered instances of setting proc_info. |
| 1090 |
|
| 1091 |
sql/sql_select.cc@1.475.4.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +43 -30 |
| 1092 |
Macroize setting thread-state info. |
| 1093 |
|
| 1094 |
Clean up some lines. |
| 1095 |
|
| 1096 |
sql/sql_show.cc@1.333.3.1, 2007-01-03 17:15:07-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 1097 |
Macro-ized other discovered instances of setting proc_info. |
| 1098 |
--- |
| 1099 |
Revert bad use of macro. |
| 1100 |
|
| 1101 |
sql/sql_table.cc@1.325.3.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +10 -10 |
| 1102 |
Macroize setting thread-state info |
| 1103 |
|
| 1104 |
sql/sql_update.cc@1.205.3.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +7 -7 |
| 1105 |
Macroize setting thread-state info |
| 1106 |
|
| 1107 |
sql/sql_view.cc@1.100.2.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +1 -1 |
| 1108 |
Macro-ized other discovered instances of setting proc_info. |
| 1109 |
|
| 1110 |
sql/sql_yacc.yy@1.498.2.1, 2007-01-03 17:15:08-05:00, cmiller@zippy.cornsilk.net +73 -1 |
| 1111 |
Add parser info for profiling. |
| 1112 |
--- |
| 1113 |
Fix new YACC shift/reduce conflict. (Now at 249.) |
| 1114 |
|